Commit Graph

9609 Commits

Author SHA1 Message Date
Chinsky
c78f47c795 Merge branch 'bleeding-edge-freeze' into tentacles 2013-05-26 05:02:34 +04:00
Chinsky
13e2d8d793 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-05-26 05:02:07 +04:00
Chinsky
76525a4ccf Merge pull request #2852 from VitrescentTortoise/bleeding-edge-freeze
Changeling husk names now 'Unknown'
2013-05-25 16:03:24 -07:00
VitrescentTortoise
827e85c4c3 Properly sets husks' names to unknown 2013-05-25 16:00:22 -07:00
cib
a764c226f8 Implemented a system to avoid the same event happening too often.
Also bumped event frequency, this shouldn't be as bad with the same event not repeating itself that often.
2013-05-26 00:12:59 +02:00
VitrescentTortoise
c451287aa8 The name of changeling husks is now unknown 2013-05-25 14:17:16 -07:00
Erthilo
e2ea94d59c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-05-25 22:16:29 +01:00
Erthilo
0e3bf2f371 Fixes UI being reset randomly on irradiating in Genetic Scanners. 2013-05-25 22:10:14 +01:00
Erthilo
4028172c98 Fixes mutantrace languages appearing as unknown for observers and also appearing as says rather than race specific word. 2013-05-25 22:09:41 +01:00
Erthilo
c2b84e0985 Fixes mutantraces (soghun, skrell, tajaran) losing languages when cloned. 2013-05-25 22:08:57 +01:00
VitrescentTortoise
afb49c05d9 Fixed lemonjuice showing up as ..what? 2013-05-25 12:52:56 -07:00
Chinsky
e197799c46 Fixes #2830
Applied Walter0o's fix to silicon namepicking locking up job spawn on roundstart.
2013-05-25 13:34:24 +04:00
Chinsky
b78cb81a38 Fixes #2849
Applied Walter0o's fix to job controller changing whole job's access when single ID was modified.
2013-05-25 13:18:12 +04:00
Jim "Apples"
858d98eb7c Merge pull request #2816 from comma/HTML
HTML in papers
2013-05-24 14:30:36 -07:00
Asanadas
e0f4b0d1ed Bugfix: Prevents airlock_controller.dm and similar from being destroyed by mech drills or acid. Prevents headaches. 2013-05-24 14:55:28 -04:00
meyar
1ac5ac6ec5 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 07:55:24 -04:00
meyar
1d5d7cb901 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-05-24 06:52:03 -04:00
meyar
c1e701f32b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2013-05-24 05:23:36 -04:00
fauxtada
cb5b83fadb Wall Charger Addition / Map Edits
- Puts in wall recharger sprite. For all your wall recharging needs.
- Reverts changes someone did moving my wall temp placement wall rechargers..
- Fixes airlocks over doors issue in sec.
- Also removed the access medical from the medical area of security. It's just a quick area to treat cuts and bruises, and shouldn't have items that treat more then that.
- Fixed some more weirdly placed rechargers around the station.
- Replaced the TG Maltese Falcon sign with the BS12 one.
- Fixed up the floor in the pool area.
- Added some lights and decorative items to that weird tator / table area south of the security pod. As well as a water tank and fuel tank.
2013-05-23 17:46:31 -07:00
cib
e9fc666cdb Removed hijack from wizard. 2013-05-24 00:12:29 +02:00
cib
0bfb43b864 Removed hijack objective. AGAIN. 2013-05-24 00:09:47 +02:00
Chinsky
30d93bd7d2 Fixed indentation derp.
I guess it was a dream when I saw it compiling.
2013-05-24 01:02:52 +04:00
Chinsky
4f293e5000 Merge pull request #2843 from Kilakk/master
Telescopic baton extend/collapse message fix
2013-05-23 13:46:47 -07:00
cib
89aa936147 Fix to organ_failure event. 2013-05-23 22:46:27 +02:00
Chinsky
665aaea722 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into tentacles 2013-05-24 00:43:33 +04:00
Kilakk
ef2c7af6a0 Telescopic baton message fix.
Fixed first- and third- person extend/collapse messages for the
telescopic baton, woo
2013-05-23 16:24:53 -04:00
cib
b5217d862a A few fixes to rp-rev
- Name was empty, hopefully using real_name fixes that
- Announcements coming too quickly
- Fixed icon path issue
2013-05-23 22:12:20 +02:00
cib
c4b8ef6e59 You can't close emagged doors anymore, but you can still remove circuitry. 2013-05-23 20:27:13 +02:00
cib
b1b448e0ee Adjusted event announcement delays.
Also improved some radiation belt announcements.
2013-05-23 20:15:45 +02:00
cib
ce19719700 Fixed two problem with airlock/APC commit:
- Debugger now sends messages to user instead of usr(whoops)
- Can now close emagged door with crowbar so you can take out circuit
- Couldn't weld emagged doors
- Replacing the circuitry should now be sufficient to fix an emagged door.
2013-05-23 19:47:33 +02:00
cib
aa6bfc33c7 Airlock and APC changes.
- Added a debugger device that can figure out when an object has been hacked/emagged
- Hacked APCs no longer display blue screen
- You can now disassemble emagged airlocks, they will yield a fried airlock electronic.
2013-05-23 16:43:29 +02:00
Chinsky
629022f7b0 Fixes #2836
Winners do not use space drugs.
Fixes LSD giving you an ability to escape death once.
Whilst hilarious, this can be breaking things that depend on mob staying dead after calling death().
My guess is that at some point halloss was counted in UpdateHeath(), but it is not anymore, so people don't die from combination of halloss and other damages being over 200.
2013-05-23 15:06:37 +04:00
Chinsky
8b60bab4a7 Merge pull request #2835 from Roaper/master
No tears, only dreams
2013-05-23 01:55:45 -07:00
Roaper
cb59473d02 Added more dreams to Dreaming.dm
Signed-off-by: Roaper <roaperable@gmail.com>
2013-05-22 13:36:27 -07:00
Chinsky
6ef40ee7a7 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
2013-05-22 21:35:50 +04:00
Chinsky
317cbd8438 Merge branch 'master' into bleeding-edge-freeze
Conflicts:
	baystation12.dme
2013-05-22 16:51:41 +04:00
Chinsky
bdb16b1f99 Renamed bruise pack back to gauze.
STAY LIKE THAT.
2013-05-22 14:05:53 +04:00
Mloc
80b8a5e70f Merge master.
Signed-off-by: Mloc <colmohici@gmail.com>
2013-05-22 10:53:29 +01:00
Chinsky
1ca42d0c88 Fixed some sharp stuff not being recognized as such.
That lead to knives bruising people you stab, for example.
2013-05-22 12:55:15 +04:00
SkyMarshal
6c8b0c23dc Small fixes, updated changelog. 2013-05-21 23:12:47 -07:00
SkyMarshal
39df196edc Fixed disposal issue.
Delayed Jungle setup until after air master initializes
Master controller now properly ceases atmos simulation if runtimes occur (and are detected).
Cleanup more ZAS stuff.  FEA_system.dm, ZAS/ZAS_Turfs.dm, ZAS_Zones.dm.
Canisters now autoconnect to portables connectors on creation.   (Fixes airlocks not having attached canisters)
Doors can now be made which respect directional door types (e.g. windoors and directional firelocks) and is handled better.
2013-05-21 23:12:47 -07:00
SkyMarshal
46907066ba Somgfkuf 2013-05-21 23:11:54 -07:00
SkyMarshal
3420b0a6fe Cleanup Debug.dm and Functions.dm 2013-05-21 23:11:53 -07:00
SkyMarshal
0ede4e13f9 Cleaned up and commented Connection.dm
Signed-off-by: SkyMarshal <skymarshal1729@gmail.com>
2013-05-21 23:11:53 -07:00
Chinsky
4885a08b27 Added 5 TC uplink to RevHeads. 2013-05-21 19:24:53 +04:00
Chinsky
1b0c6b942a NOW IT COMPILES.
Incomplete rename.
2013-05-21 18:08:28 +04:00
Chinsky
8b01f8bcc3 Finished up tentacle abominations.
Clone damage will cause body parts to mutate.
The more damage you have, the more chance to get a sweet tentacle.
Healing works other way, the less damage you have, the more chance to unmutate it.
Healing all the damage fixes everything.
2013-05-21 05:40:00 +04:00
Chinsky
1da1592ac2 Merge pull request #2818 from CIB/feature
Space no longer has a heat_capacity
2013-05-20 16:31:52 -07:00
cib
3b09c8b3a6 Space no longer has a heat_capacity
I mean, seriously? Magical realm of heat absorption? Screw that, space is now room temperature!
2013-05-21 00:46:12 +02:00
Chinsky
99fcf1b3be Merge pull request #2819 from Roaper/master
Readded Pockets in the Responder Jackets
2013-05-20 14:34:15 -07:00