cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,910 Commits 74 Branches 23 Tags
049c5c27f312efad94e6bd0070f3bda640dc290f
Commit Graph

14082 Commits

Author SHA1 Message Date
Jarcolr
049c5c27f3 Merge branch 'customs' of https://github.com/Jarcolr/Baystation12 into customs 2014-08-13 12:12:09 +03:00
Jarcolr
6c807199c9 Adds the cigar case as a premium vending item 
5 may be a bit too much, but who is going to get all those coins,
anyway?
 2014-08-13 12:10:43 +03:00
Jarcolr
2db24a17d5 Typo 2014-08-10 11:57:40 +03:00
Jarcolr
4666966dab Fixes 2 broken custom items, adds 1 new one 
Fixes hazard hardsuit icon_state, paper icon_state missing for an item,
removed krinn_hatt from obj/clothing/hats.dmi since it's defined to be
in custom_items.dmi and added MiT labcoat
 2014-08-10 11:49:14 +03:00
Jarcolr
b4e9d9923f Complements the satchels with backpacks 
5 new backpacks: virologist, chemistry, geneticist, science,
hydroponics.
 2014-08-08 22:20:11 +03:00
Jarcolr
1e90a5b218 Adds Raptor1628's hazard hardsuit 
http://baystation12.net/forums/viewtopic.php?f=33&t=10888
 2014-07-31 10:44:34 +03:00
Jarcolr
e1267b7fdf Adds Supercotton's welding mask 
http://baystation12.net/forums/viewtopic.php?f=33&t=10768
 2014-07-30 21:20:33 +03:00
Jarcolr
bd4d07c18a Adds 2 approved custom items to code 
http://baystation12.net/forums/viewtopic.php?f=33&t=10949
http://baystation12.net/forums/viewtopic.php?f=33&t=10894
 2014-07-29 22:08:32 +03:00
Jarcolr
5b77883f36 Adds 2 approved custom items and update 
http://baystation12.net/forums/viewtopic.php?f=33&t=10952 for update
http://baystation12.net/forums/viewtopic.php?f=33&t=10850 for
Cataguette's item
http://baystation12.net/forums/viewtopic.php?f=33&t=10527 for Yankee's
item
 2014-07-29 21:04:41 +03:00
Mloc
ec22ba6060 Merge pull request #5817 from PsiOmegaDelta/AI 
AI alt-click fix
 2014-07-28 12:44:32 +01:00
Mloc
7b4382977b Merge pull request #5813 from PsiOmegaDelta/Shuttle 
Fixes #5810
 2014-07-28 12:42:58 +01:00
Zuhayr
ad8ef7c4ab Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-28 20:59:29 +09:30
PsiOmega
419bc2eea3 Adds a lost AltClick click-through for the AI. Makes it possible to clear a turf alt-leftclick selection. 2014-07-28 12:10:44 +02:00
PsiOmega
537fa50728 Area naming consistency 
Changes area name from "supply shuttle" to "Supply Shuttle" to match the casing of other areas.
 2014-07-28 08:37:14 +02:00
Zuhayr
f61139f501 Merge pull request #5811 from DJSnapshot/hotfix 
Massive bugfix/improvement to 3D sounds
 2014-07-28 15:45:11 +09:30
DJSnapshot
f6b75d833c now you can hear next to you in space! 2014-07-27 23:10:57 -07:00
DJSnapshot
3b5d40c470 Big nerf and cleanup of 3D sound. should fix most of #5789 2014-07-27 21:27:41 -07:00
Snapshot
acd290ddcf Merge pull request #5807 from PsiOmegaDelta/Muta 
Fixes #5805
 2014-07-27 19:13:00 -07:00
Zuhayr
da42b20039 Merge pull request #5794 from Loganbacca/cups 
Cup grammar fix
 2014-07-28 10:11:57 +09:30
Zuhayr
11a2b0eb3c Merge pull request #5792 from Whitellama/flavourtext 
Dynamic Flavour Text
 2014-07-28 10:11:02 +09:30
PsiOmega
fc5d33917b Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives. 2014-07-27 23:32:36 +02:00
Loganbacca
4861c5a5d4 Grammar tweak 2014-07-28 07:38:24 +12:00
PsiOmega
1eaf606bb2 Merge branch 'dev' into MechInstall 2014-07-27 16:33:23 +02:00
Mloc
d6caf74e56 Merge pull request #5769 from comma/dev 
Enables logging of people beating monkey
 2014-07-27 12:02:26 +01:00
PsiOmega
2c076b4e46 Merge branch 'dev' into MechInstall 2014-07-27 12:52:42 +02:00
Chinsky
ed5b05772f Merge pull request #5777 from Loganbacca/trainfix 
Cargo train fixes
 2014-07-27 14:46:45 +04:00
Chinsky
c9d862b89a Merge pull request #5783 from Walter0o/master 
fixes nullpointer caused by broken organ list reading
 2014-07-27 14:46:31 +04:00
Chinsky
4e96420e49 Merge pull request #5761 from Zuhayr/hydroponics 
BYOND akbar
 2014-07-27 14:38:18 +04:00
PsiOmega
4f8dc3f951 Installs the new mecha-sensor in the departure area airlocks and the shuttle itself. 
Also corrects the online icon state for the sensor and allows the simple docking controller to toggle the on/off state.
 2014-07-27 10:58:55 +02:00
Loganbacca
fbc9b03e73 Cup fix 
- Grammar fix for drinking from cups
- Changed "Glass of Tomato juf" to "Glass of Tomato juice" (I'm assuming this was a typo)
 2014-07-27 20:04:45 +12:00
Whitellama
0a0c18dbf6 Fixed issue with flavour text saving/loading from other characters 2014-07-26 18:50:34 -07:00
Chinsky
5fe8865f95 Merge pull request #5771 from JimTheCactus/name_fix 
Added check for blank on name entry
 2014-07-27 05:04:05 +04:00
Zuhayr
c6e97ecc9a Merge pull request #5791 from PsiOmegaDelta/Roadblock 
Mech/Train sensor
 2014-07-27 10:12:55 +09:30
Whitellama
eb64769734 Cleaned up mistake implementing dynamic flavour text 2014-07-26 17:41:03 -07:00
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
0528675846 Added dynamic flavour text, where covered bodyparts' flavour isn't displayed 2014-07-26 17:08:55 -07:00
Whitellama
425dfd2a6e Fixed issue with recognizing covered jumpsuit and gloves 2014-07-26 17:07:34 -07:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
JimTheCactus
0b7e858000 Changes check to an isnull rather than a truth test 
This allows the client to detect the difference between a blank and someone pressing cancel.
 2014-07-26 16:19:14 -06:00
PsiOmega
0036bea6b6 A sensor which registers mechs and trains attempting to pass by and, if necessary, blocks their movement. 
If enabled, detects mechs/trains and blocks their movement if they are coming from any of the directions set by dir. Can currently only be enabled/disabled by radio command and airlocks are updated to utilize this.

The current setup allows mechs to move through airlocks during normal cycles, which for example lets Odysseus out to save lives.
Once a shuttle docks however, the sensors are enabled to prevent boarding.

If blocked, players receive a simple message stating that their command has been overridden.
 2014-07-26 20:07:18 +02:00
Zuhayr
e5eb9cc496 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:24:27 +09:30
Zuhayr
dc10f92ad1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics 2014-07-27 03:23:35 +09:30
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Zuhayr
976cb4f844 Fixed seeds not showing up properly in the vendor. 2014-07-27 03:19:43 +09:30
Mloc-Hibernia
a2dc7b827b Merge remote-tracking branch 'upstream/pr/5689' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/crew.dm
 2014-07-26 14:25:24 +00:00
Chinsky
11a1370b10 Merge pull request #5781 from PsiOmegaDelta/Tweaking 
Engine room and Atmospherics  changeup.
 2014-07-26 17:56:00 +04:00
Chinsky
c34cf89a04 Merge pull request #5784 from Jarcolr/patch-3 
Fixes #5691
 2014-07-26 17:18:38 +04:00
Walter0o
df6ac58d84 fixes nullpointer caused by broken organ list pt 2 
more a prevention than a fix, but meh
 2014-07-26 13:08:25 +02:00
Jarcolr
9e233f1597 Fixes #5691 
Chef >> Chefhat
 2014-07-26 13:41:43 +03:00
Walter0o
23811e7e5c fixes nullpointer caused by broken organ list 
the mysterious broken list bug has struck again
 2014-07-26 11:54:32 +02:00