fleure
26451b2e2c
Merge pull request #3105 from MrPerson/gias_issue
...
Safety check SMES custom input/output settings a bit.
2014-03-20 20:13:24 +00:00
Ikarrus
9221473e2c
Answered Aran's very good question
2014-03-18 21:42:59 -06:00
ikarrus
d97e7d84aa
Allows roundstart cyborgs to select their own name
...
But only if the option is enabled in the server config.
Credit to Neerti for originally coding this.
2014-03-18 21:22:51 -06:00
Razharas
41b13b4652
Merge pull request #3102 from Limeliz/patch-7
...
Added an 'e' to 'Rest'. R&D computer
2014-03-18 08:23:58 -07:00
ikarrus
e73586dadf
Resolved Conflicts:
...
code/modules/security levels/keycard authentication.dm
2014-03-18 00:17:22 -06:00
Cheridan
ca348d8cb4
Merge pull request #3095 from Ikarrus/hopian
...
Ian wearing the HoP Cap
2014-03-17 23:56:16 -05:00
Cheridan
e8a69f7d37
Merge pull request #3072 from Aranclanos/MaintDoors
...
Maint doors toggles fixes.
2014-03-17 22:40:54 -05:00
MrPerson
6ec9e5b732
Safety check SMES custom input/output settings a bit.
2014-03-17 13:27:50 -07:00
Cheridan
1b55792638
Merge pull request #3087 from Aranclanos/HumanOverlays
...
Human overlays will show themselves again.
2014-03-17 15:23:24 -05:00
Emil
05203ba8a1
Added an 'e' to 'Rest'. R&D computer
2014-03-17 17:59:07 +01:00
Razharas
072b8d2bcb
Merge pull request #3067 from Giacom/virus_food_mix
...
Forgot to change the virus mix reaction, for blood + virus food, to 1 unit.
2014-03-17 09:02:45 -07:00
Alex
8b4f076b17
Changed the required amount of blood to 1.
2014-03-17 14:35:09 +00:00
Perakp
e790ab3ab2
Merge remote-tracking branch 'upstream/master' into new_stings
2014-03-17 12:21:52 +02:00
ikarrus
f3f53181fc
Ian wearing the HoP Cap.
...
The most important update.
Also removes a rogue pixel in the human HoP cap sprite.
2014-03-16 21:52:12 -06:00
Razharas
78a6a1c416
Merge pull request #3068 from Aranclanos/Profiles
...
Profiles from client.
2014-03-16 12:52:56 -07:00
ikarrus
d065af8b8c
Emergency Access Override Update
...
-Changed the way emergency access override is handled. It now toggles a var which overrides access requirements instead of removing/adding access
-Airlocks now have blinking amber lights when in emergency mode
-AIs can toggle emergency override on individual doors
-Humans may disable emergency overrides by pulsing the ID scanner wire. They can't enable it, since IMO there are enough methods to hack open doors without an easymode all-access wire
2014-03-15 14:59:39 -06:00
Aranclanos
e773eda145
Human overlays will show themselves again.
2014-03-15 17:31:07 -03:00
Perakp
fa56f9892e
Merge with master, dissonant shriek and organic space suit
...
- Changed dissonant shriek and organic space suit from old verb system
to new system.
2014-03-15 13:49:26 +02:00
Cheridan
4e5d757726
Merge pull request #3064 from Rockdtben/removeTLEComments
...
Removing TLE comment stamps and other useless comments
2014-03-14 15:40:27 -05:00
Cheridan
50e7dbd71b
Merge pull request #2986 from Miauw62/simpleanimalspeed
...
Adjusts simple_animal speed to match recent human speed nerf.
2014-03-14 01:32:09 -05:00
Aranclanos
6dffc8a72f
The admin functions and comms console options to switch the level of access of the maint doors will now work properly and not runtime.
2014-03-14 01:57:42 -03:00
Rockdtben
a795589bfb
Revert monkey/life.dm
2014-03-13 18:48:23 -05:00
Rockdtben
c9d12f4e39
Revert human/life.dm
2014-03-13 18:47:03 -05:00
Aranclanos
7b767c7c94
Added a new admin txt under the new cfg folder. The ckeys of this list will be able to make profiles on servers that they are admins. We welcome servers to change this list as it is a configuration file. Being on this list does NOT grant you any kind of admin powers.
...
All admins will now have the control_freak disabled but for skin and macros, to make this work.
2014-03-13 15:38:06 -03:00
Giacomand
50cfb1c18b
Merge branch 'master' of https://github.com/tgstation/-tg-station into alt_override_machine
2014-03-13 16:40:04 +00:00
Giacomand
925b589f85
Forgot to change the virus mix reaction, for blood + virus food, to 1 unit.
2014-03-13 16:33:43 +00:00
Cheridan
9f98e67545
Merge pull request #3058 from Ikarrus/nohopsec
...
New Uniform for HoP
2014-03-13 11:32:23 -05:00
Cheridan
16994a1ae2
Merge pull request #3057 from Rockdtben/removeComments
...
Removed some of my useless comments from years ago.
2014-03-13 11:14:42 -05:00
Cheridan
7bb042b9c5
Merge pull request #3056 from Limeliz/patch-3
...
GPS window gets variable height
2014-03-13 10:55:03 -05:00
Rockdtben
a034e41f25
Removing TLE comment stamps and useless comments
2014-03-13 08:25:28 -05:00
ikarrus
6dd3403df3
-Updated on-mob sprites with a couple of quality fixes
...
-Corrected the HoP and Captain's preview image in character setup
2014-03-12 23:21:20 -06:00
ikarrus
c3eef7846b
-Added Nienhaus's new HoP uniform and cap. Old sprites are renamed to hop_old
...
-Removed HoP's spawning armor and moved the one in the locker higher up in order
-Glory to Nanotrasen
2014-03-12 22:32:49 -06:00
Rockdtben
6eeeb1e5fe
Removed some useless comments from years ago.
2014-03-12 07:59:34 -05:00
Emil
daa0a3458b
Stops window from getting higher than 800 px
...
Don't let the window outgrow the screen when there are an huge amount of devices available!
2014-03-12 12:33:30 +01:00
fleure
7d0ddb0e72
Merge pull request #2987 from Ccomp5950/apc_bugfix
...
APC overlay bugfix.
2014-03-12 10:46:19 +00:00
Emil
7ae7eb3941
GPS window gets variable height
...
The GPS window will now open with a variable height to exactly fit the amount of GPS devices that will be shown.
2014-03-12 10:28:56 +01:00
Cheridan
f7337f1aa9
Merge pull request #3014 from fleure/tanks
...
Added atmos and jani watertanks, changed nozzle types [MAP]
2014-03-11 21:24:27 -05:00
Aranclanos
b1a489ac07
Merge pull request #3000 from Cheridan/3000
...
adds the mime mech
2014-03-10 23:21:34 -02:00
fleure
e2d839fecd
Merge pull request #3013 from Miauw62/suitslowdown
...
Adjusts space suit slowdown to fit recent runspeed nerfs.
2014-03-11 00:24:43 +00:00
Aranclanos
638ca8e22e
Made the singularity name lowercase
2014-03-10 19:45:39 -03:00
Aranclanos
f32dc05bf7
Merge branch 'THESINGULOATEMYBOH!' of https://github.com/Miauw62/-tg-station into THESINGULOATEMYBOH!
2014-03-10 19:45:01 -03:00
fleure
b6e7155a24
Changed janitor and atmos tanks slightly
2014-03-10 20:27:21 +00:00
Cheridan
f8facf7f43
Merge pull request #3021 from Giacom/viro_genetics
...
Added two new symptoms to virology.
2014-03-10 13:31:04 -05:00
Cheridan
a7b7bd0bf2
Merge pull request #3023 from Jordie0608/allthebuttons
...
Reload admins usable by anyone with adminrank
2014-03-09 14:10:17 -05:00
Giacomand
c386bbd286
Changed overriden machines so that they do not attack cyborgs that aren't synced to the AI.
...
Overriden machines are their own subtype now.
Did not use the faction variable as that can be unreliable as neutral hostile mobs will attack any other mob without the neutral faction flag.
2014-03-09 10:16:37 +00:00
Rockdtben
bf995b001b
Merge pull request #3019 from drynwyn/master
...
Switch tournament gangster ammo to match weapon
2014-03-08 08:36:53 -06:00
Jordie0608
1fc448c043
Reload admins usable by anyone with adminrank
2014-03-08 15:46:36 +11:00
Robson Richards
49e0cbd125
Reworked arguments to suit new GetTypeInAllContents
2014-03-07 21:06:46 +00:00
Robson Richards
0b07ae9f72
Merge branch 'master' of https://github.com/tgstation/-tg-station into 23/02/2014-Fuck-Nuke-Disk
2014-03-07 20:55:34 +00:00
Giacomand
a92482ee4a
Added two new symptoms to virology. They will mutate the victim and randomly set a power/disability block, after cleaning it to remove remaining powers/disabilities. One symptom only sets powers and the other only sets disabilities.
...
Changed the virus mix reaction to only require one plasma or mutagen, to remove the annoyance that virology has with the randomness aspect of it.
Refactor'd dna code to be a little tidier.
2014-03-07 17:49:01 +00:00