21439 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
PsiOmegaDelta	e4de0e18cc	Merge pull request #7240 from GinjaNinja32/travis ... Update Travis to check split map files	2014-12-05 19:09:04 +01:00
GinjaNinja32	72e01bc29a	Change the map file(s) that Travis checks, ensure it errors if one or more is not present	2014-12-05 17:54:32 +00:00
GinjaNinja32	a4f1c617b8	Allow typing all arguments to adminhelp	2014-12-05 17:06:16 +00:00
Zuhayr	93805d5742	Merge pull request #7225 from PsiOmegaDelta/SyndiBorg ... Syndicate borg code refactoring.	2014-12-05 23:37:31 +10:30
PsiOmegaDelta	422ff9b39e	Merge pull request #7236 from mwerezak/ops-docking ... Remaps the nuke ops shuttle for station docking	2014-12-05 13:57:31 +01:00
Zuhayr	d5c5418384	Merge pull request #7226 from Amunak/chat-shenanigans ... Minor changes for ghosts, added verb to remain anonymous	2014-12-05 23:26:11 +10:30
PsiOmega	4a0536bca7	Fixes #7233. ... Making sure the skills list is always initiated, even when not created as a player mob.	2014-12-05 11:55:16 +01:00
mwerezak	5b1f7695e3	Remaps the nuke ops shuttle for station docking ... Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch. Drops the viro/xenobio docking arm. Adds a button so that the teleporter blast door can be operated independently of the airlock blast door. Fixes some leftover arrivals area just hanging around in space. Adds a poster specifically for the nuke ops shuttle.	2014-12-05 01:17:17 -05:00
Zuhayr	d78d93e3e1	Merge pull request #7231 from mwerezak/secure-airlock ... Makes secure electronics printable, airlock cleanup	2014-12-05 16:22:55 +10:30
mwerezak	3dc947806f	Cameras now use the broken circuitboard item as well.	2014-12-04 17:16:56 -05:00
mwerezak	89cef05a19	Merge remote-tracking branch 'upstream/dev' into secure-airlock	2014-12-04 17:15:27 -05:00
mwerezak	674817ff0b	The wire datum UI now indicates if the wires have been randomized.	2014-12-04 16:49:18 -05:00
mwerezak	58f227ec69	Cleans up airlock electronics ... Removes the icon_state hack Moves airlock electronics creation into it's own proc. Moved airlock creation from a door assembly to airlock/New()	2014-12-04 16:40:27 -05:00
Ccomp5950	5bc722417e	Merge pull request #7221 from PsiOmegaDelta/Sprites ... Custom Sprites	2014-12-04 15:12:37 -05:00
Ccomp5950	09f1a6b444	Merge pull request #7207 from PsiOmegaDelta/Beds ... Bed and mercenary shuttle refactoring.	2014-12-04 15:12:26 -05:00
mwerezak	83a482a548	Makes secure airlock electronics available from the circuit imprinter	2014-12-04 13:28:26 -05:00
mwerezak	99910686ad	Holocarp can spawn in the space scenery with a small probability.	2014-12-04 10:03:35 -05:00
PsiOmega	55f2dc2233	Merge remote-tracking branch 'upstream/dev' into 'origin/Beds'. ... Conflicts: maps/exodus-1.dmm	2014-12-04 14:26:27 +01:00
PsiOmega	201d2f42a3	Merge remote-tracking branch 'upstream/dev' into Beds	2014-12-04 14:12:54 +01:00
PsiOmegaDelta	68644b0e5e	Merge pull request #7219 from Loganbacca/chairfix ... Tape and chairs	2014-12-04 14:10:46 +01:00
PsiOmegaDelta	11c2d7af23	Merge pull request #7215 from mwerezak/camera ... Allows cameras to be broken	2014-12-04 14:10:42 +01:00
Amunak	e8c41b38f7	Fixed the message for admins when they use 'ghost'. ... Just for clarity, because I'm bad at English. Props to Omega for the wording.	2014-12-04 12:58:32 +01:00
PsiOmega	1f9cb08102	Syndicate borg code refactoring. ... Refactors the borg syndicate code to be more accessible to adminbus. Syndicate borgs have a jetpack module. Overrides canUseTopic() to limit what the Syndi-borg can interact. Still has all access, may be more limited in the future if Bump() is refactored /tg/ style. Admins: Spawn with care.	2014-12-04 12:56:29 +01:00
Amunak	ab01b270a7	Added missing EOL in observer.dm	2014-12-04 11:51:31 +01:00
Amunak	39c6e3e431	Ghosts/observers now have the option to be anonymous in deadchat. ... It is a ghost-time preference that doesn't get saved. Admins see anonymous ghosts with a * next to their key. People talking in dead bodies are now always seen only with the name of their body (admins see their keys with a ^).	2014-12-04 11:46:31 +01:00
Amunak	9fe0cdac28	Admins will now receive a prompt to use aghost when they use ghost. ... It replaces the usual prompt that was irrelevant to admins anyway. Adds option for admins to aghost from the ghost prompt.	2014-12-04 11:35:04 +01:00
Loganbacca	feda97bfe3	Duct Tape ... - Added several rolls of duct tape around the map	2014-12-04 21:55:26 +13:00
Loganbacca	c4c90adc8e	Added tape roll ... - Added 1x tape roll to office supplies pack	2014-12-04 21:54:41 +13:00
Loganbacca	883e4991ed	Psych office chair fix ... - Fixes #7216	2014-12-04 20:59:11 +13:00
Loganbacca	18cc00b5c0	Research object update ... - Updates research testing object to include phoron and engineering tech	2014-12-04 20:49:43 +13:00
Loganbacca	fd53575658	Implant cases ... - Adds freedom implant in glass case variant - Changes implants created from protolathe to variants in glass cases	2014-12-04 20:48:45 +13:00
mwerezak	77288fb951	Merge remote-tracking branch 'upstream/dev' into camera ... Conflicts: code/game/machinery/portable_turret.dm	2014-12-03 23:37:02 -05:00
PsiOmega	806e200857	Merge remote-tracking branch 'upstream/dev' into Beds	2014-12-03 23:03:43 +01:00
Ccomp5950	5fc6518e21	Merge pull request #7217 from mwerezak/syndie-suit ... Adds mask and oxygen tank to uplink kits that provide space suits.	2014-12-03 17:02:48 -05:00
Ccomp5950	55b66b9039	Merge pull request #7220 from PsiOmegaDelta/DismantleThatWindow ... Fixes #7214.	2014-12-03 17:02:29 -05:00
Ccomp5950	0bb7b81355	Merge pull request #7192 from PsiOmegaDelta/Turrets ... Turret controls now affects all aspects of slaved turrets.	2014-12-03 17:01:39 -05:00
mwerezak	63aa4b1a4e	Holodeck computer uses more power when active and turns off if power is lost. ... Allows players to float when using the 'Space' holodeck scenery. Fixes holodeck deleting space carp when the scenery is changed. Holocarp start docile and cannot leave the holodeck unless the conole is emagged.	2014-12-03 15:04:59 -05:00
PsiOmega	c7021cea13	Custom Sprites ... Adds Star Light and I-96, see http://baystation12.net/forums/viewtopic.php?f=33&t=11701 and http://baystation12.net/forums/viewtopic.php?f=33&t=11702 respectively.	2014-12-03 20:48:00 +01:00
mwerezak	6a2ceeb4af	Allows floating in the space holodeck scene	2014-12-03 12:55:51 -05:00
mwerezak	01fbe4b542	Fixes portable turret ex_act() ... Class 3 is the least severe, not the most.	2014-12-03 10:36:30 -05:00
mwerezak	fad5506683	Cameras can be broken by weapons/projectiles, fixes ... Fixes being able to show papers to AIs through deactivated cameras. Fixes being able to break doors with TOX, OXY, and CLONE damage. Fixes camera alarms persisting after the camera is deleted. Fixes #7021. Some camera cleanup.	2014-12-03 10:36:30 -05:00
PsiOmega	cb4a4d67a1	Merge remote-tracking branch 'upstream/dev' into Turrets	2014-12-03 11:38:54 +01:00
PsiOmega	52346094f8	Fixes #7214. ... Dismantling a window should now return an appropriate number of sheets for its type.	2014-12-03 11:06:33 +01:00
PsiOmega	74d9441a1c	Merge remote-tracking branch 'upstream/dev' into Beds	2014-12-03 09:06:34 +01:00
mwerezak	7049156519	Adds mask and oxygen tank to uplink kits that provide space suits.	2014-12-02 22:24:53 -05:00
Ccomp5950	19bbc4a004	Merge pull request #7212 from Loganbacca/ducttape ... Duct Tape	2014-12-02 20:32:04 -05:00
Ccomp5950	cadfecddce	Merge pull request #7202 from PsiOmegaDelta/PlasticBag ... Constructable blood packs.	2014-12-02 20:31:12 -05:00
Ccomp5950	25224491ce	Merge pull request #7195 from PsiOmegaDelta/BloodDrive ... Cargo can now order empty blood packs.	2014-12-02 20:31:04 -05:00
Ccomp5950	19bbd2c60c	Merge pull request #7193 from PsiOmegaDelta/MapItMore ... Fixes #7191	2014-12-02 20:30:52 -05:00
Ccomp5950	f1c77dcb16	Merge pull request #7190 from PsiOmegaDelta/Topic ... Fixes exploit that lets AIs use machinery even after cameras are disabled.	2014-12-02 20:29:47 -05:00