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
iksyp
496f73bc56
implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo ( #36855 )
...
* loyality
*fixed a bug that made coding relating to loyalty implants basically impossible
* did i say loyalty i meant mindshield
* and the .dme as well
this commit and last were webeditor but it should work
2018-04-02 19:46:01 -05:00
vuonojenmustaturska
adf4786470
Merge pull request #36617 from ShizCalev/logging-cleanup
...
Improves some logging legibility
2018-03-28 12:17:32 -05:00
kevinz000
0e4f0c0211
Exploit
2018-03-13 23:04:15 -05:00
vuonojenmustaturska
f3ad4b932d
Implants that grant spells to their owners, for adminbus ( #36116 )
...
* badmin implants
* honk
2018-03-04 15:43:37 -06:00
kevinz000
0e22fe7660
Chem implants can no longer be activated by action button ( #36087 )
2018-03-03 06:12:06 -06:00
CitadelStationBot
1e65c813f0
[MIRROR] Extensive surgery additions ( #5590 )
...
* Extensive surgery additions
* Update role_preferences.dm
* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
deathride58
05ab5f7c0c
Merge pull request #5510 from Citadel-Station-13/upstream-merge-35552
...
[MIRROR] [s]Fixes writing bugs/exploits
2018-02-16 01:32:23 +00:00
deathride58
3dac047801
Update implanter.dm
2018-02-15 20:09:30 -05:00
ShizCalev
98bbfb8709
[s]Fixes writing bugs/exploits
2018-02-15 16:10:03 -06:00
KorPhaeron
0ed0abbd4c
Slime Radio Potion ( #35548 )
...
* Slime Radio Potion
* Deletes inaccurate comment
2018-02-15 10:38:59 -06:00
KorPhaeron
e64a42c248
Mining sentience upgrade grants minebots a radio and ID ( #35235 )
...
* Minebots get mining radio+ID card
* Updates radio implant paths
2018-02-11 05:13:46 -06:00
Jordan Brown
fd479e7128
Replaces some var values with defines
2018-02-10 11:11:09 -06:00
Poojawa
fb5de29784
cleanup of game folder, other fixes
2018-01-31 06:39:18 -06:00
coiax
481f73aba0
Costumes for nuclear operatives
2018-01-24 13:58:35 -06:00
ShizCalev
68cfdb617b
Fixes rev mindswap ( #34567 )
2018-01-21 12:29:12 -06:00
JJRcop
ed6ec3d63a
Removes some hrefs from logging ( #34310 )
...
* Removes key_name_admin calls from logging
* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
coiax
866318e33e
Internal radio implant
2017-12-29 02:52:24 -06:00
LetterJay
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
deathride58
b2187123fb
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
...
[MIRROR] [Ready]Brain Trauma additions
2017-12-21 03:42:38 +00:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
LetterJay
eb9260c8bf
Update implantcase.dm
2017-12-17 17:38:09 -06:00
XDTM
962f135957
[Ready]Brain Trauma additions
2017-12-17 11:11:10 -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
08af4665b4
Update implant.dm
2017-12-13 16:45:54 -05:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
deathride58
6a8cffc3d5
Update implantuplink.dm
2017-12-10 18:03:04 -05:00
oranges
d88bff9fa9
Restores the uplink modules, removes LoadComponents
2017-12-10 14:14:37 -06:00
deathride58
742d50b5e7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
...
# Conflicts:
# code/citadel/custom_loadout/custom_items.dm
# code/datums/components/riding.dm
# code/game/objects/items/implants/implantuplink.dm
# icons/mob/neck.dmi
# icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00
Leo
97c04d1430
Merge pull request #33262 from AutomaticFrenzy/patch/uplink-implant
...
Fix uplink implants not working
2017-12-05 15:39:25 -06:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05:00
deathride58
738c1b7b2a
Update implantuplink.dm
2017-11-22 17:57:43 -05:00
oranges
cec6c028f5
[READY]Refactors uplinks to a component!
2017-11-22 15:17:03 -06:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
AnturK
2ecb4c216c
Datum rev & related upgrades to base datum antag
2017-10-18 02:26:11 -05:00
oranges
5c49bab3c5
Merge pull request #31135 from KorPhaeron/unconvertable
...
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
pubby
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
MoreRobustThanYou
df607bb24c
Implant Chairs now also support organs ( #30982 )
...
* Implant Chairs now also support organs
* Update implantchair.dm
* Update implantchair.dm
2017-09-24 11:55:22 -05:00
Robustin
894673ef97
Fixes revolutionary deconversion messages and logging
2017-09-23 11:07:05 -05:00
CitadelStationBot
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
c42304737a
Update implantchair.dm
2017-09-11 17:47:55 -05:00
LetterJay
c03e216016
Update implantchair.dm
2017-09-11 14:05:58 -05:00
kingofkosmos
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
