cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a7fa8cde4994fc37c37d74484cd3aa88f1daefaa
CHOMPStation2/code/game/objects/items
History
PsiOmegaDelta a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
..
devices
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-11 08:54:03 +02:00
robot
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-05 09:35:02 +02:00
stacks
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-24 10:31:30 +02:00
weapons
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-11 08:54:03 +02:00
apc_frame.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-08 09:57:33 +02:00
blueprints.dm
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
bodybag.dm
code/game/objects, code/game/machinery merge fix
2015-06-02 20:18:45 +01:00
contraband.dm
…
crayons.dm
Adds the ability to draw arrows with crayon
2015-07-09 23:35:06 -04:00
glassjar.dm
…
latexballoon.dm
…
paintkit.dm
Added get_bodytype() species proc as groundwork for subspecies.
2015-08-22 02:53:16 +09:30
shooting_range.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-07-30 10:49:37 +02:00
toys.dm
Merge pull request #10340 from comma/russian_roulette
2015-09-03 19:40:01 +02:00
trash.dm
…