Commit Graph

136 Commits

Author SHA1 Message Date
Dahlular
de98ccfa83 Merge pull request #539 from ArchieBeepBoop/mobholders
Enter the Elements System
2020-10-02 17:00:15 -06:00
Dip
fbbdfdfeb4 a 2020-10-02 19:49:58 -03:00
Dip
461cd2b042 getting micro to work again 2020-10-02 19:46:12 -03:00
Dip
4d39d175c4 partially enable micro holding 2020-10-02 14:40:10 -03:00
Dip
2580196fc1 area blacklist 2020-10-02 03:18:23 -03:00
Dip
0c9bc3e9d7 src fix 2020-10-02 02:22:47 -03:00
kevinz000
f318dbe1b2 Merge pull request #10881 from Ghommie/Ghommie-cit552 2020-10-02 02:14:44 -03:00
Lin
730307bc05 Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6
Fixes the petting element.
2020-10-02 01:18:00 -03:00
Lin
0fc4cbeff5 Merge pull request #10047 from Ghommie/Ghommie-cit425
Turns dog/cat petting into an element datum.
2020-10-02 01:17:25 -03:00
kevinz000
014bc3e026 Merge pull request #10046 from Ghommie/Ghommie-cit424
Ports flag for bespoke elements.
2020-10-02 00:51:46 -03:00
Lin
ac25b449f7 Merge pull request #9856 from Ghommie/Ghommie-cit367 2020-10-02 00:49:56 -03:00
Ghom
20c30a15d1 Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
2020-10-01 23:13:20 -03:00
Ghom
b433eab324 Merge pull request #10350 from Putnam3145 2020-10-01 23:04:52 -03:00
kevinz000
4714bd9012 initial element 2020-10-01 22:36:19 -03:00
Archie
7a5ef569b6 Radiation Shutters + Micro Opts + Engine Weight 2020-09-30 03:51:53 -03:00
QuoteFox
fb53009ce0 Merge pull request #532 from TotallyNotADog/fixMusician
removes quirk shitcode
2020-09-29 02:41:46 +01:00
Dip
3cd86a33c6 Radiation Update Port 2020-09-28 22:18:29 -03:00
Unknown
1127553e87 removes quirk shitcode 2020-09-28 19:48:04 -05:00
Ghom
d17d5a1ed0 Merge pull request #10744 from r4d6/Moar-Engines
Moar engines!
2020-09-27 14:36:04 -03:00
Putnam3145
c983e3662b a 2020-09-27 14:33:13 -03:00
Dip
6ca9ab451b stupid typo 2020-09-27 01:47:49 -03:00
QuoteFox
cfd822170f Merge pull request #502 from ArchieBeepBoop/hunter2
Cursed Blood Trait (fixed)
2020-09-27 05:35:43 +01:00
Dip
caa288de49 fixes medical record formatting 2020-09-27 00:57:41 -03:00
Lin
09cbc115b6 Medical and security records 2020-09-26 21:23:20 -03:00
QuoteFox
bf62c2fa78 Merge pull request #515 from ArchieBeepBoop/lavahermit2
Properly Airtight Lavaland Hermit + low cost
2020-09-26 23:04:44 +01:00
Dip
5a1930e213 properly airtight hermit + low cost 2020-09-26 14:07:03 -03:00
Dip
d9b37ab1d1 radiation affects mobs again 2020-09-25 16:04:27 -03:00
Dip
bf11aa68dc fix 2020-09-25 11:00:36 -03:00
Dahlular
a6648fa822 Revert "Cursed Blood Trait" 2020-09-25 06:23:51 -06:00
Dahlular
99065c9f92 Merge pull request #494 from ArchieBeepBoop/hunter
Cursed Blood Trait
2020-09-25 06:11:24 -06:00
Dahlular
29fe614523 Merge pull request #482 from ArchieBeepBoop/ruinspawn
Changes Oldstation, Free Golem, Syndie Comms placement weight and cost
2020-09-25 06:06:06 -06:00
Dip
fe85e4afea commit 2020-09-24 16:36:27 -03:00
QuoteFox
324dd8327d Merge pull request #487 from ArchieBeepBoop/runtimefixes
Let's play the game of experimental runtime fixes.
2020-09-24 11:25:54 +01:00
CygnusB
960372f6ea lmao
penis music
2020-09-23 23:28:48 -03:00
Dahlular
cfa6e536c8 Merge pull request #489 from Chemlight/Lightweight-Trait
Lightweight trait
2020-09-23 19:23:26 -06:00
Chemlight
decfb768e2 Lightweight trait
A lightweight trait that was ported from skyrats, gives you twice the drunk power from drinks, watch what you down with each swig!
2020-09-23 00:11:54 -07:00
Dip
72c8e681e3 runtimev1-experimental 2020-09-22 16:37:51 -03:00
Dip
cdd63b427e placement_weight 2020-09-20 19:30:07 -03:00
Dahlular
faf578d691 Merge pull request #476 from ArchieBeepBoop/radglow
Ports TG #51879 - Rads Glow, Goggles Buff
2020-09-19 09:21:02 -06:00
Dip
0a9ffc234a SON THIS IS RAD 2020-09-19 03:07:17 -03:00
Dahlular
54f5a85771 Giantism Hotfix
whoops forgot to make it spawn lmao
2020-09-17 08:56:33 -06:00
Burns-The-Potatos
3db4913b12 adds blindness, coldblooded, flimsy, tough
see title
2020-09-16 17:40:17 -07:00
Dahlular
6be7a731f1 Some fixes + Neuters Growth Serum 2020-09-14 03:06:44 -06:00
Dahlular
3b541cb9e5 Reworks Dwarfism and Adds Giantism 2020-09-14 02:45:45 -06:00
Dip
6f3d356aa4 typo 2020-09-13 02:07:20 -03:00
Dip
c35c942f72 Language Diversity / Racial fixes 2020-09-12 22:30:37 -03:00
JaySparrow
a0afddfa95 Ninja Nerf
Emp 25 > 40
Ninja Star 1 > 10
Teleport 3 sec > 10 sec
No more capture objectives
Changed an instance of Nanotrasen to Kinaris.
2020-09-09 01:46:05 -05:00
Dahlular
0c7b49d745 Merge pull request #387 from Jay-Sparrow/antags
Lewd Antag
2020-08-31 02:41:58 -06:00
QuoteFox
d416922b24 Rustg update and global ban search for admins
global ban search for admins
2020-08-14 00:44:18 +01:00
JaySparrow
999f2d6662 Lewd Antag
Finally
2020-08-09 19:22:38 -05:00