Commit Graph

320 Commits

Author SHA1 Message Date
LetterJay
1fbc06234f Update __donator.dm 2018-05-05 07:24:37 -05:00
LetterJay
bbebcc85e7 Update __donator.dm 2018-05-05 07:23:33 -05:00
deathride58
184441eb38 Merge pull request #6078 from Commandersand/LOADOUT
MORE LOADOUT STUFF
2018-05-02 17:29:44 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
ab3c55ab23 replaces randomized wires with departmental wires (#6376) 2018-04-27 07:42:09 -07:00
deathride58
d2fbb671ba Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498)
* adjuststaminabuffer() now drains borg cells, borgs can now sprint, removes aiming down sights, combat mode now makes you face your cursor

* forgot to ctrl+s here
2018-04-27 07:41:31 -07:00
deathride58
4702d0232e Merge pull request #6465 from Michiyamenotehifunana/polychromicdonators-Wave2
Wave 2 of exclusive polychromic clothes
2018-04-27 09:47:16 +00:00
deathride58
ddd9d670d3 Merge pull request #6484 from DravenPeace1/Branch-2
Branch 2
2018-04-27 09:45:53 +00:00
deathride58
c92d4da83d Merge pull request #6519 from Poojawa/snowflake-protection
Fixes shitcode in slime code
2018-04-27 09:37:11 +00:00
Poojawa
918e4c50eb ensures tails reset taur mode 2018-04-26 07:37:49 -05:00
Poojawa
110878de18 Update jellypeople.dm 2018-04-26 07:27:47 -05:00
Poojawa
f29859ddbd fixes my shitcode 2018-04-26 07:27:09 -05:00
Poojawa
95e3a2b266 Fixes shitcode 2018-04-26 07:14:42 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
Poojawa
832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
DavenPeace1
5fb1eddec9 Even more extras! 2018-04-23 03:40:13 -03:00
LetterJay
3044f3ad3a Merge pull request #6468 from Poojawa/teleport-code-reee
Fixes teleportation bugs with cryopods and vore
2018-04-22 22:23:49 -05:00
Poojawa
09b14dfbea Fixes teleportation bugs with cryopods and vore 2018-04-21 22:53:24 -05:00
Michiyamenotehifunana
6a2b8bca3f Dumps in a bunch of donator exclusive polychromes 2018-04-20 17:34:59 +08:00
DavenPeace1
f5e07db1b5 More extras! 2018-04-18 23:56:43 -03:00
deathride58
5f37b59107 on second thought, the cell usage change is a little dumb, the stamloss per watt isnt much different from its original value 2018-04-17 22:32:25 -04:00
deathride58
521cc43664 makes pump-disabler slug slightly more cell-efficient than pump-disabler spread 2018-04-17 21:26:00 -04:00
deathride58
9678de1f2f the fuck are these numbers 2018-04-17 21:17:54 -04:00
LetterJay
b3f42dce0b Update __donator.dm 2018-04-15 21:56:02 -05:00
Chayse Ramsay
58111c6482 Fixing slimepeople (#6386) 2018-04-12 08:39:44 -07:00
deathride58
4b87170139 Adds "Man up" verb for admins. (#6296)
* adds man up verb

* Update admin_verbs.dm

* adds man up global

* blech
2018-04-10 17:34:45 -07:00
LetterJay
33d6ee9f96 Update __donator.dm 2018-04-10 11:54:50 -05:00
Michiyamenotehifunana
4c86571f9a Preliminary polish and implementation of exclusive polychromics 2018-04-10 22:56:16 +08:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
kevinz000
820f4e7998 Update preferences.dm 2018-04-08 19:40:57 -07:00
kevinz000
83f1332229 >wiped my flavortext accidently 2018-04-08 19:39:06 -07:00
deathride58
8abcb08d9e Merge pull request #6249 from Citadel-Station-13/kevinz000-patch-3
meme update
2018-04-08 04:17:06 +00:00
deathride58
87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
deathride58
a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
2018-04-05 00:17:27 +00:00
deathride58
4636817ab5 Update packs.dm 2018-04-04 17:18:36 -04:00
loginsandylogout
740c76beb9 damn 2018-04-04 13:23:15 -05:00
loginsandylogout
34fe469aa2 hold on 2018-04-04 13:22:27 -05:00
loginsandylogout
c2615881c7 ah 2018-04-04 13:21:42 -05:00
loginsandylogout
e7612b44fe should fix it all 2018-04-04 13:19:59 -05:00
loginsandylogout
e14ff635ec okay 2018-04-04 13:18:54 -05:00
loginsandylogout
7459b8b03c hhhj 2018-04-04 13:16:49 -05:00
loginsandylogout
c27cb38a53 hhh 2018-04-04 13:14:30 -05:00
loginsandylogout
53454d8ab9 d 2018-04-04 13:13:30 -05:00
loginsandylogout
3b4b557687 a 2018-04-04 13:12:52 -05:00
loginsandylogout
d2cf2e8018 HMMM 2018-04-04 13:12:27 -05:00
loginsandylogout
d845bf84a9 k 2018-04-04 12:56:34 -05:00
loginsandylogout
a4e3b19891 maybe 2018-04-04 12:55:52 -05:00
loginsandylogout
417fa9e264 yes 2018-04-04 12:52:40 -05:00
loginsandylogout
cee51cd79d should fix conflicts 2018-04-04 12:50:02 -05:00