Commit Graph
21 Commits
Author SHA1 Message Date
atermonera 10372ec726 Laptops don't eat IDs 2018-05-20 18:26:15 -07:00
Atermonera 3f1194696a Brain type is shown on all records 2017-04-22 18:18:31 -07:00
Spades 2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
SinTwo a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
SinTwo 4f7ea573c1 world time fix 2016-07-30 03:19:47 -04:00
Yoshax 8be10d96dd Ports Byond 510 preperations from Bay
Updates comment

Updates supply file
2016-03-14 18:21:44 +00:00
Zuhayr 7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr 98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
PsiOmegaDelta f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
2015-12-13 10:15:29 +01:00
Chinsky 8940705921 Fixes #9091 2015-12-12 14:40:51 +03:00
PsiOmegaDelta 1e7251ded4 Id card handling changes.
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
2015-08-21 14:04:06 +02:00
PsiOmegaDelta 9e46dfbb56 Re-arranges data record and crew arrival announcement code. 2015-07-28 11:27:44 +02:00
GinjaNinja32 dfd871f168 code/machinery, fix for code/antagonist merge string causing false positive 2015-05-30 14:05:32 +01:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
volas 5fee41d4ba sanitize() refactor: third pass (misc) 2015-03-25 01:05:21 +03:00
volas f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
volas 855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
2015-02-04 04:44:09 +06:00
PsiOmega 1732d0c79a Merge remote-tracking branch 'upstream/master' into TheGreatPurge
Conflicts:
	code/WorkInProgress/computer3/computers/message.dm
	code/WorkInProgress/kilakk/responseteam.dm
2015-02-03 14:16:14 +01:00
Chinsky 72463a35f3 Another pass at WIP folder 2015-02-03 12:14:13 +03:00