Commit Graph

7386 Commits

Author SHA1 Message Date
VistaPOWA
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
VistaPOWA
fe410178fb Gives Razharas' icon to the syndieborg
Adds the crowbar and flash module to the syndieborg loadout
Changes the TC_cost variable of the teleporter to update with the
uplink_items TC_cost (thanks for the help Giacom).
2014-01-06 18:32:38 +01:00
VistaPOWA
6b600b2a02 now properly 2014-01-05 23:49:32 +01:00
VistaPOWA
eb00590d7a reorganized the code a bit 2014-01-05 23:47:44 +01:00
VistaPOWA
74f2edcb56 Makes the borg spawner and the contract a subtype of antag_spawner 2014-01-05 21:32:43 +01:00
VistaPOWA
2dcde243f3 Made the teleporter refundable
Also fixes a missing return
2014-01-05 17:29:34 +01:00
VistaPOWA
cc553c23f4 Increases the cost of Syndicate Cyborgs
Now it's 25 TC.
2014-01-05 14:51:04 +01:00
VistaPOWA
60deb3c010 reverts another merging failure 2014-01-05 14:13:46 +01:00
VistaPOWA
68afbbcc18 move along people, nothing to see here 2014-01-05 03:35:17 +01:00
VistaPOWA
fd34cea8ef fixes the merging failure
hopefully that's it
2014-01-05 03:32:10 +01:00
VistaPOWA
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
Cheridan
5426868c53 Merge pull request #2178 from errorage/2013_12_29_scalable_ui
Adds framework for multiple UI styles for humans, with a no-UI mode being the first example. Also makes all mobs' UIs scalable.
2014-01-03 14:23:08 -08:00
Giacom
12f13456ae Merge pull request #2207 from Cluwnes/tcomrades
Added ckey + real_name logging to server logs for "NTLS"
2014-01-03 13:57:03 -08:00
Razharas
80b592d0b3 Resolving conflicts
God hates git
And so do i
2014-01-03 21:12:14 +04:00
Giacom
537b6ddba0 Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
Removes the gag ball.
2014-01-03 04:19:29 -08:00
Giacom
09da906881 Merge pull request #2187 from Tenebrosity/newradiofrequencycolours
Adds new radio frequency colours
2014-01-02 10:41:09 -08:00
Giacom
0cd059432e Merge pull request #2135 from ChuckTheSheep/patch-2
Fixed an oversight in Wizard-Spell targeting code
2014-01-02 10:33:27 -08:00
Giacom
b2e53335f0 Merge pull request #2167 from rymd/text-fix
Fixed destructive analyzer failure messages
2014-01-02 10:32:32 -08:00
Giacom
6e5e5efb5b Merge pull request #2184 from Cluwnes/invisimessages
Adds ckey logging to PDA message sending
2014-01-02 10:32:01 -08:00
Giacom
70a4d8e9af Merge pull request #2192 from Cheridan/iDidThisByHand
Obsoletes flags = FPRINT | TABLEPASS*
2014-01-02 10:31:46 -08:00
Giacom
c56cc9c89f Merge pull request #2122 from Miauw62/disposalsfix
Disposals will no longer create invisible floor tiles.
2014-01-02 10:30:12 -08:00
Cheridan
68362d7b49 fixing conflicts
THANKS GIA

:I
2014-01-02 10:04:22 -06:00
Cheridan
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
Giacom
248e6e94d7 Merge pull request #2170 from Rockdtben/throwAtRefactor
Refactored throw_at
2014-01-02 07:21:03 -08:00
Giacom
542aca21f8 Merge pull request #2186 from Cluwnes/theunknownchicken
Gives the chicken suit head some inv_flags
2014-01-02 07:20:27 -08:00
Razharas
06d1969fef Fixed some issues
No more suicider cloning
Added comments to the DNA and R&D wizardry
Added CLONE_INITIAL_DAMAGE define for the ammount of clone and brain
loss clones initially have in clonepod
Removed debug garbage
2014-01-02 09:27:51 +04:00
Razharas
8d6536821e Merge branch 'master' of https://github.com/tgstation/-tg-station into MachinesOverhaulANdR&D 2014-01-02 09:02:01 +04:00
Aranclanos
1e3f2c37a6 Removes the gag ball. 2014-01-01 23:43:01 -03:00
Cheridan
8006b75307 Merge pull request #2182 from Rockdtben/sayRefactor
Refactored how say deals with masks. As well as derp speech.
2014-01-01 14:46:04 -08:00
Cheridan
6c644f4652 Merge pull request #2185 from Cluwnes/itspersonnell
Those personnell were successfull.
2014-01-01 14:36:09 -08:00
Cheridan
87e69e0515 Merge pull request #2206 from fleure/stabbystab
Fixed stabbing head with thick suit on
2014-01-01 14:28:29 -08:00
Cheridan
004c3d7be6 Merge pull request #2198 from Incoming5643/wands3
[Marble Madness] Improved Logging on the Bolt of Change
2014-01-01 14:14:49 -08:00
Cheridan
b659a2b829 Merge pull request #2203 from Perakp/jauntFix
Fixes Ethereal Jaunt
2014-01-01 13:54:34 -08:00
Cheridan
5f3bfa028b Merge pull request #2191 from Incoming5643/SMconfusion
Changes the initialism for stat collecting on summon magic to SU
2014-01-01 13:42:12 -08:00
Giacom
4832398f88 Merge pull request #2181 from errorage/2013_12_29_dmg_overlay_thresholds
Changes damage overlay threshold from 10+ to 35+
2014-01-01 07:50:35 -08:00
fleure
4a01ed176c Fixed stabbing error message target check 2014-01-01 15:33:49 +00:00
Cluwnes Honk
637c2ef9d3 Added ckey logging to server logs for "NTLS"
Standardizes the logging for message_admins() and adds realname and ckey logging to server logs. Also fixes a spelling error in the message_admins().
2013-12-31 18:30:58 -08:00
fleure
61f2cf9292 Fixed stabbing head with thick suit on 2013-12-31 23:39:30 +00:00
fleure
be0f52b623 Fixed bruisepacks not working 2013-12-31 17:06:34 +00:00
Perakp
a7ead625be Fixes Ethereal Jaunt
notransformation protection was stopping movement calls to the holder object.
Refractored code so wraith phase shift isn't copypaste just to change animations.
2013-12-31 17:28:50 +02:00
Incoming
b33efbfa6b Improves logging on the bolt of change so admins can follow the paper trail of terrible mobs who get turned into other terrible mobs 2013-12-31 01:11:20 -05:00
Tenebrosity
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
Aranclanos
0184a61ef9 Syringe guns will now work on aliens properly 2013-12-30 19:44:58 -03:00
Cheridan
d1c3251931 Merge pull request #2183 from fleure/arcade
Building arcade machines now works
2013-12-30 13:26:58 -08:00
Cheridan
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
Aranclanos
15d055a602 Merge pull request #2031 from Alek2ander/master
VV permissions check update, fixes #2009
2013-12-30 12:50:09 -08:00
Incoming
02a91e4c76 Changes the initialism for stat collecting on summon magic to SU because SM was taken by smoke. On the stat page this will result in smoke being overreported until a full month after this change has been live on both servers.
For judgement purposes you can probably assume that nearly all "smoke" spells on the stat page are actually summon magic, because who the hell takes smoke?
2013-12-30 14:26:37 -05:00
Aranclanos
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
Cheridan
f1fb63d5e2 Merge pull request #2160 from Cluwnes/werequire1sample
We require at least 1 sample of compatible DNA.
2013-12-30 10:15:25 -08:00
Robson Richards
6397796058 Removes a Check by Aran's request 2013-12-30 17:31:39 +00:00