shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
8ebfe4885a060f90b94f11d856c61fa47fb11c8a
GS13NG/code/game/objects/items
History
Trilbyspaceclone f8147e5a85 Ports over Mortars and Pestles (#11546) 
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-24 14:03:31 +01:00
..
circuitboards
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08:00
devices
Massive optimization for sink objective. (#11563)
2020-03-22 13:01:36 +01:00
grenades
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
implants
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
melee
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
2020-03-21 16:04:26 +01:00
robot
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
2020-03-21 16:04:26 +01:00
stacks
Ports over Mortars and Pestles (#11546)
2020-03-24 14:03:31 +01:00
storage
Merge pull request #11524 from Ghommie/Ghommie-cit627
2020-03-23 10:40:31 -07:00
tanks
…
tools
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
AI_modules.dm
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
airlock_painter.dm
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
apc_frame.dm
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
balls.dm
fix
2020-02-13 16:25:43 -07:00
blueprints.dm
…
body_egg.dm
…
bodybag.dm
…
boombox.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
candle.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
cardboard_cutouts.dm
…
cards_ids.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
charter.dm
…
chromosome.dm
…
chrono_eraser.dm
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
cigs_lighters.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
clown_items.dm
…
control_wand.dm
…
cosmetics.dm
…
courtroom.dm
…
crayons.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
debug_items.dm
Updates the debug outfit
2020-02-06 18:42:23 +01:00
defib.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
dehy_carp.dm
…
dice.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
dna_injector.dm
stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520)
2020-03-19 13:40:11 +01:00
documents.dm
…
eightball.dm
…
extinguisher.dm
…
flamethrower.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
gift.dm
…
granters.dm
Merge pull request #11408 from necromanceranne/sleeping_carp_port
2020-03-11 17:26:33 -07:00
handcuffs.dm
Porting more legcuffs / bola fixes etcetera
2020-03-09 16:20:51 +01:00
his_grace.dm
…
holosign_creator.dm
…
holy_weapons.dm
Adds ghost role eligibility to various ghost roles. (#11549)
2020-03-22 13:02:23 +01:00
hot_potato.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
inducer.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
kitchen.dm
Merge branch 'master' into more_implants
2020-02-22 18:34:02 -05:00
latexballoon.dm
…
manuals.dm
…
miscellaneous.dm
Force pushed updates
2020-03-22 01:43:19 +01:00
mop.dm
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
2020-03-21 16:04:26 +01:00
paint.dm
…
paiwire.dm
…
pet_carrier.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
pinpointer.dm
actually makes contractor pinpointer do things
2020-03-02 01:36:11 +01:00
plushes.dm
Update plushes.dm
2020-02-24 02:21:51 -07:00
pneumaticCannon.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
powerfist.dm
…
RCD.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
RCL.dm
Update RCL.dm
2020-03-10 14:44:33 +01:00
religion.dm
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
RPD.dm
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
RSF.dm
…
scrolls.dm
…
sharpener.dm
…
shields.dm
Update code/game/objects/items/shields.dm
2020-03-01 00:48:45 -05:00
shooting_range.dm
…
signs.dm
…
singularityhammer.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
stunbaton.dm
Update stunbaton.dm (#11559)
2020-03-22 13:37:16 +01:00
taster.dm
…
teleportation.dm
Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11
2020-02-24 16:40:17 +01:00
teleprod.dm
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
telescopic_iv.dm
…
theft_tools.dm
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
toys.dm
Merge pull request #10451 from kevinz000/mobility_flags
2020-03-05 20:03:56 -05:00
trash.dm
…
twohanded.dm
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
2020-03-21 16:04:26 +01:00
vending_items.dm
…
weaponry.dm
Merge pull request #11306 from Ghommie/Ghommie-cit598
2020-03-06 00:20:36 -07:00