Dax Dupont
d368c42a98
Fixes extremely thicc robots ( #35722 )
...
* Fixes extremely fat robots
* grasp
2018-02-17 10:13:08 -06:00
LetterJay
14d387fa04
Merge pull request #5513 from Citadel-Station-13/upstream-merge-35542
...
[MIRROR] Cleans up some duplicate canusetopic warnings
2018-02-15 22:17:54 -06:00
oranges
5dc3549801
Merge pull request #35542 from ShizCalev/free-spam-removal
...
Cleans up some duplicate canusetopic warnings
2018-02-15 20:35:03 -06:00
deathride58
e873fce53f
Update laws.dm
2018-02-15 20:28:05 -05:00
AnturK
10a40524ab
Cleans up remnant traitor cyborg code and AI hacking.
2018-02-15 10:40:04 -06:00
deathride58
72ff7be9bd
code folder. 221 files changed wew
2018-02-12 21:03:40 -05:00
ShizCalev
f4685cfe01
[s] Fixes altclick exploits
2018-02-11 05:08:00 -06:00
deathride58
a34dc0b90b
Update personality.dm
2018-02-10 19:51:21 -05:00
Jordan Brown
fd479e7128
Replaces some var values with defines
2018-02-10 11:11:09 -06:00
vuonojenmustaturska
56369b7f99
Fixes geiger counters on engiborgs ( #35423 )
...
* a commit
* Update geiger_counter.dm
2018-02-08 11:21:27 -06:00
oranges
d427e0174b
Merge pull request #35346 from DaxDupont/kinky-cuffs
...
Fixes cyborg related cuffing issues
2018-02-08 03:07:51 -06:00
Slignerd
afcdb771b3
Squashes silicon HUDs together ( #35212 )
...
* Squashes silicon sensors together
* Fixes proc names
* Brings back individual sec/med huds for pai usage
* This fixes the pai
* Fixes toggle text
2018-02-07 02:32:14 -06:00
CitadelStationBot
9e229691cc
Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines ( #5304 )
2018-02-05 04:23:09 -06:00
CitadelStationBot
b25bcbbfab
[MIRROR] Fixes power cell name and makes borgs use a standard high capacity cell. ( #5315 )
...
* Fixes power cell name and makes borgs use a standard high capacity cell. (#35265 )
* Fixes name for upgraded power cell
* Harmonizes battery for cyborgs
* Remove duplicate battery code
* Fixes power cell name and makes borgs use a standard high capacity cell.
2018-02-05 00:47:39 -06:00
Poojawa
a7f0ffb6f0
modules
2018-01-31 06:56:28 -06:00
Poojawa
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
Leo
90b2e77b78
Merge pull request #34769 from ShizCalev/var-cleanup
...
Cleans up unused mob vars
2018-01-23 06:44:32 -06:00
AnturK
3dc89ba058
Antag Panel / Check antagonists Refactor
2018-01-19 08:43:49 -06:00
ShizCalev
80095fea0a
Replaces cached get_area vars for names ( #34338 )
2018-01-13 20:56:11 -06:00
PKPenguin321
145cc8a822
Makes cyborg module damage visible to anyone nearby ( #34287 )
...
* swaps to_chats with visilbe_messages in damage feedback
* adds an actual alarm sound
2018-01-11 21:32:24 -06:00
Leo
5cc7492f0a
Merge pull request #34187 from ShizCalev/butcher-droplocation
...
Switches butchering/gib drops to use drop_location
2018-01-10 03:12:39 -06:00
deathride58
6957a6f13f
Merge branch 'master' into upstream-merge-34105
2018-01-08 20:03:41 +00:00
oranges
1e9598dfbd
Clean up a bunch of undefined arg runtimes
2018-01-07 20:53:12 -06:00
deathride58
66f0a9c2b7
mob living silicon
2018-01-04 01:06:25 -05:00
oranges
3208404f14
Merge pull request #33580 from Xhuis/defenses_balancing
...
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-30 16:59:07 -06:00
LetterJay
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
LetterJay
f093bb8fec
Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856
...
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
2017-12-29 06:22:35 -06:00
LetterJay
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
deathride58
b03a8a70db
Merge pull request #4556 from Citadel-Station-13/upstream-merge-33442
...
[MIRROR] [READY]Adds picking up corgis and pAIs!
2017-12-29 06:47:17 +00:00
YPOQ
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
deathride58
3df98e631b
Fixes compiling errors
2017-12-28 16:13:30 -05:00
deathride58
2fdb9e598f
Modularizes dogborgs, adds new alternate skins for some modules, and more!
2017-12-28 15:50:33 -05:00
kevinz000
bf7838aded
[READY]Adds picking up corgis and pAIs!
2017-12-27 15:47:57 -06:00
YPOQ
752e3f7378
Fixes AI camera lights not updating when tracking mobs ( #33849 )
2017-12-26 18:30:24 -06:00
LetterJay
5dd7136225
Merge branch 'master' into upstream-merge-33590
2017-12-25 21:29:18 -06:00
Jordan Brown
af1f13e114
Merge pull request #33306 from coiax/replace-clean-flag-with-component
...
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
2017-12-23 08:36:37 -06:00
kevinz000
bec20087c2
[READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-22 10:58:13 -06:00
Matthew
529e839203
dog borgs module icon fix
2017-12-21 13:46:44 -06:00
LetterJay
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
deathride58
7ca4a29cac
Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465
...
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-14 03:54:31 +00:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
Jordan Brown
129cd705d1
Correctly set description of nonstandard cells
2017-12-13 09:12:55 -06:00
AnturK
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
deathride58
a17e7ae3cf
Merge pull request #4283 from Citadel-Station-13/upstream-merge-33358
...
[MIRROR] Replace pAI verb tab with an action button
2017-12-10 03:11:54 +00:00
Tad Hardesty
0a71554d7f
Replace pAI verb tab with an action button ( #33358 )
...
pAI suicide is now standardized with other suicides. The Software
Interface verb has been changed to an action button. This eliminates the
need for a verb tab for only two verbs.
2017-12-08 22:46:30 -06:00