cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,165 Commits 94 Branches 23 Tags
549270c73c018ccef20085550aa93feee6da3cd9
Commit Graph
9513 Commits
Author SHA1 Message Date
mwerezak 549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
Chinsky e0c00bda55 Merge pull request #8973 from mwerezak/inventory2 
Inventory updates
 2015-04-26 20:13:21 +03:00
Chinsky 5f30d0fa9a Merge pull request #8982 from PsiOmegaDelta/Bullets 
Adds practice rounds.
 2015-04-26 20:06:37 +03:00
Chinsky 7359562e16 Merge pull request #8905 from PsiOmegaDelta/BorgModules 
Silicon Subsystem update.
 2015-04-26 20:06:21 +03:00
Chinsky 946373f8a0 Merge pull request #8975 from PsiOmegaDelta/Thunderdome 
Custom ambiance music for holodeck programs.
 2015-04-26 20:05:58 +03:00
PsiOmega fe09ed1a22 Merge remote-tracking branch 'upstream/dev' into BorgModules 
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/mob/living/silicon/ai/subsystems.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_upgrades.dm
 2015-04-26 15:52:18 +02:00
Zuhayr 8e0d0900d9 Merge pull request #8875 from PsiOmegaDelta/TheSummoning 
Destroy/qdel
 2015-04-26 22:14:07 +09:30
PsiOmega e54fbcb9ec Cleans up borg module code and responsibilities. 2015-04-26 12:00:30 +02:00
mwerezak 229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/modules/customitems/item_defines.dm
 2015-04-26 02:04:59 -04:00
mwerezak 4829f1d82d Adds calls to mob_can_unequip() where appropriate 2015-04-25 13:55:24 -04:00
mwerezak 3a00fce32b Refactors mob_can_equip(), adds unequip checks 2015-04-25 13:54:59 -04:00
PsiOmega 4a35631af1 Attempts to save Yosh's code. 2015-04-25 16:39:09 +02:00
PsiOmega d7bbc6f1c3 Makes it possible to define custom ambiance music for holodeck programs. 
Cleans up holodeck code. Revives an old SS13 track, THUNDERDOME!
 2015-04-25 10:53:14 +02:00
Zuhayr 173329f675 Merge pull request #8968 from Jarcolr/signed 
Adds 9 new bar signs.
 2015-04-25 03:09:35 +09:30
PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
Jarcolr 28c037b6ce Adds 9 new bar signs. 2015-04-24 17:35:07 +03: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
Chinsky 60e7aacf79 Merge pull request #8951 from Dennok/patch-15 
floorlayer
 2015-04-24 10:04:29 +03:00
Chinsky e0da322ee3 Merge pull request #8956 from mwerezak/gametime 
Makes crit oxyloss and malf AI timer run in gametime instead of realtime.
 2015-04-24 10:03:06 +03:00
PsiOmega eee67109d1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/say.dm
 2015-04-23 13:15:43 +02:00
Zuhayr f06326556a Merge pull request #8838 from Dennok/patch-5 
Pipelayer
 2015-04-23 20:03:20 +09:30
Dennok dfa0735c1d Remove .contents in loop. 2015-04-23 11:59:34 +03:00
mwerezak 3acfe5960e Renames inventory slot string key defines 2015-04-23 04:57:03 -04:00
mwerezak 7a8ae91c6a Makes crit oxyloss and malf AI time run in gametime instead of realtime. 2015-04-23 04:42:58 -04:00
Zuhayr c7ec25e8f8 Merge pull request #8855 from comma/soundenv 
Sound environments
 2015-04-23 17:04:30 +09:30
mwerezak 1bbb19297e Implements item_state overrides for back slot, hands 
Updates backpacks to use the item_state overrides where necessary, fixes #8577
 2015-04-23 03:26:18 -04:00
Chinsky 392cc1b0bb Merge pull request #8938 from GinjaNinja32/floorpainter 
Fixes floor painter white-bot and white-delivery states
 2015-04-23 09:20:13 +03:00
Chinsky df21e9fc2e Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers 
Shower curtains no longer lose their default color upon being washed.
 2015-04-23 07:34:44 +03:00
Chinsky 6cc8be6d90 Merge pull request #8936 from Dennok/patch-14 
Automatic CableLayer
 2015-04-23 07:34:00 +03:00
mwerezak 5b037670b3 Removes most instances of item_color 
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
 2015-04-22 17:40:27 -04:00
Dennok 813109af88 Add span classes 2015-04-22 23:30:46 +03:00
Dennok b5317f398a Create floorlayer.dm 2015-04-22 23:16:20 +03:00
PsiOmega 4ce1ec1f3d Pipelayer feedback. 
Adds span use. Updates and adds visible messages as necessary.
Corrects more instances where on was used instead of a_dis.
 2015-04-22 16:49:54 +02:00
Dennok dc19c22056 Fix 2015-04-22 11:27:18 +03:00
PsiOmegaDelta 7a27aece0d Merge pull request #8941 from Baystation12/master 
Dev
 2015-04-22 09:32:56 +02:00
Dennok 204e41a4fc Add code to CableLayer 2015-04-22 08:42:49 +03:00
GinjaNinja32 bc6daf5b5f Fixes floor painter white-bot and white-delivery states 
Fixes #8937
 2015-04-22 05:21:03 +01:00
Dennok ae978d6cea Create Cable Layer 2015-04-21 21:00:28 +03:00
Chinsky bcfb746465 Merge pull request #8901 from PsiOmegaDelta/ShakeShake 
Structure/table shaking.
 2015-04-21 20:04:41 +03:00
Kelenius 446efb3809 Fixed attacking blob breaking logs 2015-04-21 19:57:45 +03:00
PsiOmega eaa8e341f9 Makes it possible to shake structures people are climbing on to make them stop. 2015-04-21 17:45:09 +02:00
PsiOmega f6d0ab1578 Shower curtains no longer lose their default color upon being washed. 
NT has now invested in slightly less budget curtains.
 2015-04-20 14:42:43 +02:00
PsiOmega 3810bef4bf Merge remote-tracking branch 'upstream/master' into dev 2015-04-20 08:39:56 +02:00
Chinsky b437c5654a Merge pull request #8902 from PsiOmegaDelta/FiredoorFixTwo 
Another emergency shutter fix.
 2015-04-19 16:10:07 +03:00
Chinsky 940b5c8c62 Merge pull request #8891 from volas/sanitize3 
sanitize() 3
 2015-04-19 14:59:36 +03:00
Chinsky 109aed4fcf Merge pull request #8897 from PsiOmegaDelta/LaptopsAreTheWorst 
Fixes #8895.
 2015-04-19 14:59:25 +03:00
Chinsky a3962980ac Merge pull request #8898 from PsiOmegaDelta/eject_cartridge 
Adds a PDA cartridge ejection verb.
 2015-04-19 14:56:59 +03:00
Zuhayr 0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
Neerti b178e56a3b Lazy fix because microwaves are terrible. 2015-04-18 22:04:05 -04:00