Commit Graph
74 Commits
Author SHA1 Message Date
CitadelStationBot 9c5b764058 Makes pulsing the AI wire of a borg offer the user the option to change it and properly notifies the AI when it is cut. 2017-07-06 09:53:35 -05:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
PoojawaandGitHub 36a1898bde Dogborg balance tweaks (#1805)
* Update dogborgstuff.dm

* Compile fixes

* minor code standards tweaks
2017-07-05 10:01:57 -05:00
CitadelStationBot abeac9d2ae Fixes PAIs deleting their card on death 2017-06-26 15:55:15 -05:00
CitadelStationBot 10f3b3db50 Fixes the AI core being flammable 2017-06-26 09:38:44 -05:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJayandGitHub 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
LetterJay a544d99f9f cleanup and commits 2017-06-19 12:35:05 -05:00
Verkister bac4cebfe8 removed a twig fro mthe gearbox. 2017-06-14 23:43:21 +03:00
Verkister 4f3d39c693 A new dogborgo.
-Stole some virgo borgo modifications for them puppies.
-Added janiborgo dog.
-Nuked the fine balance with horribly abusable exploits :^)
-Y'all hubbie 4chog gamerkids can suck my egg.
-This update received Jay's blessing before I even started porting these.
2017-06-14 23:13:38 +03:00
LetterJayandGitHub 4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
2017-06-14 06:41:01 -05:00
CitadelStationBotandkevinz000 16f968f5e5 Some other code now uses ai status display list (#1506) 2017-06-13 13:43:04 -07:00
CitadelStationBotandkevinz000 33eb60747f Refactored advanced camera consoles (#1576) 2017-06-13 13:39:47 -07:00
CitadelStationBot b2fc9c4dee Outfits janitor cyborgs with a screwdriver, crowbar, and floor tiles 2017-06-12 15:34:37 -05:00
LetterJay 55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot 54d8e3a159 You can no longer mount borgs while stunned. 2017-06-08 17:18:09 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBotandkevinz000 c1adecc0e2 Fix AI status displays to use a list instead of the world list (#1391) 2017-06-04 09:08:04 -07:00
CitadelStationBotandkevinz000 63f9657d9b Refactors a cooldown var to not require a spawn or sleep (#1381) 2017-06-04 09:06:47 -07:00
CitadelStationBotandkevinz000 d74b8d187a Binary talk now logs in the individual logging (#1335) 2017-06-02 22:01:15 -07:00
CitadelStationBot ac23b06edd Borg module resets now require cutting instead of pulsing the reset wire 2017-05-31 19:56:43 -05:00
LetterJayandGitHub 46bcc34a0e Merge pull request #1214 from Citadel-Station-13/upstream-merge-27677
[MIRROR] Adds marker beacons to miner borgs
2017-05-31 01:53:38 -05:00
LetterJayandGitHub f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
[MIRROR]  Refactors explosions
2017-05-30 15:15:51 -05:00
CitadelStationBot 94fdea8866 Some pAI fixes 2017-05-29 14:42:48 -05:00
CitadelStationBot 4b9a7ce9cf Adds AI follow links to PDA messages and holopad speech 2017-05-28 08:14:21 -05:00
CitadelStationBot 364cfe633b Adds marker beacons to miner borgs 2017-05-26 19:09:46 -05:00
CitadelStationBot 11344c4682 Refactors explosions 2017-05-24 16:45:00 -05:00
CitadelStationBot 6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -05:00
PoojawaandGitHub 45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot 36072177f9 [READY]Peacekeeper cyborg projectile dampening fields, attempt three 2017-05-18 16:36:50 -05:00
CitadelStationBotandPoojawa 257cf986c5 Repaths C4 (#808)
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
2017-05-18 00:37:20 -05:00
LetterJayandGitHub bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
CitadelStationBotandkevinz000 42fe8eb7c7 Fixes riding messages always using male pronouns (#869) 2017-05-10 16:05:14 -07:00
LetterJayandGitHub 2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
LetterJay acf8cb1597 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876 2017-05-05 10:26:02 -05:00
LetterJayandGitHub caaf0fc2ee Merge pull request #698 from Citadel-Station-13/upstream-merge-25743
[MIRROR] Holocalls
2017-05-05 10:19:28 -05:00
CitadelStationBot 56d5e12263 Moves languages to a holder datum, gives mind its own language holder 2017-05-05 08:13:04 -05:00
CitadelStationBot f7d45f3010 Fixes say verbs not working 2017-05-04 18:41:04 -05:00
LetterJay 4ecbec1406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720 2017-05-02 11:36:27 -05:00
LetterJayandGitHub 3b8484b52b Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
CitadelStationBot 36dfc5a4db Holocalls 2017-05-01 12:53:40 -05:00
CitadelStationBot 7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted 2017-05-01 07:24:45 -05:00
LetterJayandGitHub 06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot 402c451cc3 Adds organ storage containers 2017-04-28 20:56:26 -05:00
CitadelStationBot caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBotandPoojawa e7df2bc14a [MIRROR] Minor refactors (#515)
* Minor refactors

* Update client_procs.dm

* Delete client_procs.dm.rej
2017-04-26 11:13:41 -05:00
CitadelStationBotandPoojawa 84321916a5 Refactors ears into organs (#513)
* Refactors ear damage into ear organs

* Update human.dm

* Update species.dm

* Delete species.dm.rej

* Update tgstation.dme

* Delete tgstation.dme.rej

* Delete human.dm.rej

* Update tongue.dm

* Delete surgery.dmi

* upload fixed surgery.dmi
2017-04-26 09:52:35 -05:00