671b49cba1
Fixes the double-energy draw of the esword, makes the syndicate icon properly display for the borg.
2014-01-11 17:04:17 +01:00
74f2edcb56
Makes the borg spawner and the contract a subtype of antag_spawner
2014-01-05 21:32:43 +01:00
2dcde243f3
Made the teleporter refundable
...
Also fixes a missing return
2014-01-05 17:29:34 +01:00
68afbbcc18
move along people, nothing to see here
2014-01-05 03:35:17 +01:00
fd34cea8ef
fixes the merging failure
...
hopefully that's it
2014-01-05 03:32:10 +01:00
443d6e2d9e
[MAP] Adds Syndicate Borgs
...
Nuclear Operatives can now order a Syndicate Borg for 20TC. After
spawned, a candidate from ghosts is chosen to control it.
It has a 25k cell and the following modules:
-Emag
-Esword
-Ebow
-Laser Rifle
-Jetpack
All weapons use 100 charge per shot.
2 borg rechargers have been added to the Syndicate Shuttle for the
Syndieborgs to use.
Changelog will be added in a separate commit.
2014-01-05 03:13:40 +01:00
537b6ddba0
Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
...
Removes the gag ball.
2014-01-03 04:19:29 -08:00
09da906881
Merge pull request #2187 from Tenebrosity/newradiofrequencycolours
...
Adds new radio frequency colours
2014-01-02 10:41:09 -08:00
3a11af405c
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
...
Conflicts:
code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
1e3f2c37a6
Removes the gag ball.
2014-01-01 23:43:01 -03:00
6c644f4652
Merge pull request #2185 from Cluwnes/itspersonnell
...
Those personnell were successfull.
2014-01-01 14:36:09 -08:00
be0f52b623
Fixed bruisepacks not working
2013-12-31 17:06:34 +00:00
b3d37e1d0a
Makes deathsquad frequency (144.1) a different colour again, this time grey to differentiate it from science's plum.
2013-12-31 16:50:17 +13:00
bb9c09df46
Obsoletes flags = FPRINT | TABLEPASS*
...
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.
Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.
If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
d5ddac3a00
Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
...
Cyber limbs fixes [FIXES #1920 ] + [Fixes #2180 ] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
e4b251a488
Adds different radio frequency colours for engineering, security, medical, service and supply.
2013-12-30 20:09:35 +13:00
a348534ab1
Personnelly, I feel this pull request was successfull.
...
Spelling fixes.
2013-12-29 15:54:50 -08:00
d3d4c79946
Merges Heal_Damage and Heal_robotic_damage procs
...
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
53bfd06609
Fixes #2180 - Augmented limb healing issues
2013-12-29 16:12:32 +00:00
92636bbe01
Merge pull request #2168 from fleure/toolbox
...
Fixed toolbox parent object giving error
2013-12-29 08:00:11 -08:00
171147b1bf
Fixed toolbox parent object giving error
2013-12-28 14:51:35 +00:00
2482fd0702
Makes cards pocketable.
...
Adds w_classes to cards so you can actually pocket the things.
2013-12-27 15:49:21 -08:00
b9efeaa932
Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
...
Item name fixing round3
2013-12-26 23:14:15 -08:00
ef25332511
Merge pull request #2125 from Miauw62/ifitfeelsright
...
Folding boxes updates sprites properly
2013-12-26 20:13:09 -08:00
0c8c6a5de2
Fixed #1119 folding boxes updates sprites properly
2013-12-22 19:21:45 +01:00
0338a66c2a
Adds fingerprints to a bunch of stuff. De-texts computer build paths.
2013-12-22 18:57:33 +01:00
df626a1f06
correct paint can names and plural status, corrected pill box names, corrected lockbox names.
2013-12-22 11:28:10 +01:00
58d0ed5221
Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites
...
Security Sprite updates.
2013-12-21 15:24:14 -08:00
f00c80bd43
Merge pull request #2104 from Giacom/gulag_therevenge
...
[MAP] The Gulag: The Revenge: Part 2.5
2013-12-21 15:05:57 -08:00
e7579e2aa8
Merge pull request #1986 from Perakp/janitorCartFix
...
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
516ec6076d
Merge pull request #2102 from Razharas/Flamethrower
...
Fixes flamethrowers shooting through stuff
2013-12-21 13:57:33 -08:00
5fb0d05dd1
Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou
...
Small fixes for Linda.
2013-12-21 13:57:15 -08:00
9d24a900ae
Merge pull request #2066 from Perakp/slipFix4
...
No slipping when lying down
2013-12-21 13:54:39 -08:00
90ecfcbc4b
Merge pull request #2063 from Nienhaus/master
...
Posters
2013-12-21 13:37:20 -08:00
e3f82955e4
Merge pull request #2080 from Razharas/no
...
Fixes morgue trays used by ghosts and what not
2013-12-21 01:12:04 -08:00
c40af6ae40
Update icons after item is placed in cart.
2013-12-21 09:50:15 +02:00
65e0931d55
Merge branch 'master' into janitorCartFix
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
47545f439e
* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.
...
* Added sprites for the stacking machine going in the reverse direction, just set the dir to 1 instead of 2.
* Added prison intercoms which will not broadcast until someone hacks it. Added these intercoms in the gulag, the perma brig and the brig cells.
* When a prisoner has received enough points for freedom, if they try to move the shuttle, or open the middle door, while someone is on it they will get an error message. This way there is no way for a free'd prisoner to release their fellow prisoners once they have reached their point target. The shuttle will depart right away when you call the shuttle from the stacking console, to stop prisoners from getting on while it departs.
2013-12-20 22:09:06 +00:00
ae6a4d9b18
Fixes flamethrowers shooting through stuff
...
Fixed #2059
They need to be fixed more, but thats a theme for another PR
2013-12-20 22:57:41 +04:00
0f016a054f
Merge pull request #2078 from Razharas/train
...
Fixes chameleon projector
2013-12-19 21:54:17 -08:00
213f3fff31
Some fixes for Linda, now the Move() proc of objects that block air is different. Example below.
...
object/Move()
var/turf/T = loc
..()
move_update_air(T)
2013-12-19 22:13:21 -03:00
f8c05e2169
Security Sprite updates.
...
Replaces all instances of the old Swat and riot sprites with Validsalad's new ones
Replaces Sechailer's with Officer, Warden and HoS versions code and Sprites wise (Sptires by Validsalad again)
The officer gas mask is gas/sechailer, the warden's is gas/sechailer/warden and the HoS's is gas/sechailer/hos
2013-12-19 23:14:51 +00:00
0fdcd42592
Merge pull request #2054 from Cheridan/Nuke
...
Nuke Ops Tweaks: Flamer and Mechas
2013-12-19 13:37:32 -08:00
2f70aaadb3
Removes magic numbers and an useless check
...
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
1ce0b11b0d
Fixes morgue trays used by ghosts and what not
2013-12-19 00:23:36 +04:00
bce9e5d826
Fixes chameleon projector
2013-12-19 00:01:59 +04:00
68ff764463
Subtypes of janiborg tools
...
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
7bb4cf6a79
Makes the attackby() of storage objects return 0 if the can_be_insterted() fails. This will fix hand labelers on pill bottles.
2013-12-18 12:25:39 -03:00
b54cab665a
No slipping when lying down
...
- No slipping when lying down
- Doesn’t change slipping mechanics otherwise.
2013-12-18 15:03:03 +02:00
ab76fe339d
Forgot a .
...
...
2013-12-18 00:11:26 -06:00
VistaPOWA
Giacom
Cheridan
Aranclanos
fleure
Tenebrosity
Cluwnes Honk
Robson Richards
Rockdtben
Miauw
Kyrah Abattoir
Perakp
Razharas
Nienhaus