7b17bf2acd
god damn bitflags ARGH
2019-11-21 20:30:49 +00:00
7460c28b60
Merge branch 'OrganQoL' of https://github.com/Thalpy/Citadel-Station-13 into OrganQoL
2019-11-21 19:39:58 +00:00
0cce3a01f4
Ghommie's requiem
2019-11-21 19:39:55 +00:00
a0a52018f3
Apply suggestions from code review
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-21 19:06:34 +00:00
da1da717d2
Update code/game/objects/items/devices/scanners.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-21 19:03:48 +00:00
bd07ff4bf7
This should be the one!
2019-11-21 18:55:43 +00:00
b911fabb37
Okay bedtime
2019-11-21 04:25:25 +00:00
b90213882e
Again with the rouge
2019-11-21 03:58:16 +00:00
01f465dc8c
Scanner formatting
2019-11-21 03:52:00 +00:00
18e1246fd0
Classic fixes
2019-11-21 03:16:18 +00:00
cc53a0061f
Well it compiles
2019-11-21 02:15:58 +00:00
f883f55391
Merge pull request #9818 from GrayRachnid/portssaboteur
...
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
2019-11-19 21:28:25 -07:00
40a01dedfe
Merge pull request #9806 from BlackMajor/Yote
...
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
3edaf75722
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
2019-11-15 16:58:45 -05:00
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
d5a245945c
Merge pull request #9742 from Seris02/gpsthing
...
makes gps show location on examine
2019-11-14 16:44:40 -07:00
322c90fab2
Mistake I have done when copypasting.
2019-11-14 13:32:57 +01:00
487f98bf68
Merge pull request #9775 from Ghommie/Ghommie-cit340
...
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
2019-11-14 01:40:16 -07:00
3015ec5c04
Merge pull request #9764 from Ghommie/Ghommie-cit335
...
Dreamchecker compatibility changes, part 1.
2019-11-14 01:37:41 -07:00
0c33757b14
Fixes a few bugs
2019-11-14 18:54:57 +13:00
ce94da9ed3
Merge branch 'master' into Yote
2019-11-14 17:37:57 +13:00
b9a7685830
Adds dogborg catch for doggos and some
2019-11-14 17:14:14 +13:00
e50c56150e
ports "Adds superlube to the clown ruin" and buffs clown PDAs
2019-11-11 23:10:22 +01:00
d06b6fd83e
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
2019-11-11 21:34:47 +01:00
63da5ffb13
ID console fixes and other tweaks.
2019-11-11 17:10:14 +01:00
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
92455b5b8c
Merge pull request #9695 from Ghommie/Ghommie-cit311
...
Unmodularize and update pAI/Intellicards very slighty.
2019-11-10 11:40:14 -07:00
e8219dd9f7
Merge pull request #9697 from Poojawa/patch-1
...
Better Health Analyzer formatting
2019-11-10 11:35:07 -07:00
6dc3fca905
makes gps show location on examine
2019-11-08 19:24:54 +08:00
a650e1e411
Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness"
2019-11-05 05:37:28 +01:00
6462d0c8c8
Merge pull request #9658 from Ghommie/Ghommie-cit291
...
Fixing dogborg sleepers runtimes, how atrocious...
2019-11-03 06:20:30 -07:00
d8e0771dcd
Better Health Analyzer formatting
...
Because having it all bunched up is a pet peeve.
2019-11-02 23:14:39 -05:00
7e4aef46d9
Unmodularize and update pAI/Intellicards very slighty.
2019-11-03 04:23:31 +01:00
d9c38d0589
Merge pull request #8948 from Ghommie/Ghommie-cit156
...
Cleaning up the arousal module.
2019-10-31 17:27:03 -07:00
6dc6159f4a
Merge pull request #9578 from deathride58/mapsubsystemimprovements
...
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
6a64647ee8
Fixing dogborg sleepers runtimes, how atrocious...
2019-10-29 19:45:10 +01:00
80cd4902ca
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273
2019-10-28 00:49:22 +01:00
79c3700d25
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-10-25 12:42:28 +02:00
da502aa31d
Merge pull request #9535 from Ghommie/Ghommie-cit247
...
Fixing sniper rifles scope datum action oddity.
2019-10-24 19:05:25 -07:00
2ae111eaf0
Merge pull request #9587 from Ghommie/Ghommie-cit258
...
Porting components updates and fixing phantom thief component.
2019-10-24 18:38:39 -07:00
ad7101d0aa
ports anti-magic component code updates (holymelon not included).
2019-10-25 03:20:42 +02:00
a50606bb67
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
2019-10-24 10:10:07 +02:00
4c8d7023c5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258
2019-10-24 09:50:20 +02:00
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02:00
68813b6846
Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer
2019-10-22 19:14:12 -04:00
e991328087
progress
2019-10-19 15:02:56 +02:00
475303bd02
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-10-17 00:50:30 +02:00
184e81eec0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-16 01:51:51 -05:00
18f10afcd7
Borgs are now consumable by scrub pups.
2019-10-13 15:23:50 -05:00
Thalpy