shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

204 Commits

Author SHA1 Message Date
Putnam3145
670141edf7 Merge pull request #10209 from Ghommie/Ghommie-cit470 
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
 2019-12-17 11:26:36 -08:00
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Useroth
5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Useroth
a37f2de71d First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs. 2019-12-08 14:00:08 +01:00
Artur
02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
BlackMajor
786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie
17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
Ghommie
8c21fac476 513 compatibility 2019-10-30 22:24:00 +01:00
kevinz000
66faef41f8 Merge pull request #9350 from Tupinambis/UIChanges 
Cyborg UI Beautification and Improvements
 2019-10-29 21:33:34 -07:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Ghommie
dac6fef57a Also implementing /tg/station pr #40767 2019-10-09 00:38:09 +02:00
GrayRachnid
9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
Tupinambis
37aacacf30 Finishes up sprite changes 2019-09-23 20:20:23 -05:00
Tupinambis
f03e966507 Cyborg UI beautification 2019-09-23 16:58:20 -05:00
Tupinambis
0c2641d5c2 Changes borg UI slightly 2019-09-22 19:19:42 -05:00
Chayse Ramsay
f9d829b111 Proc to define 2019-08-04 05:48:08 +01:00
Chayse Ramsay
46e4023ba9 Monkey business 2019-08-04 05:07:24 +01:00
Chayse Ramsay
a0a21dc01f !iscarbon to !ishuman 2019-08-03 18:36:46 +01:00
Chayse Ramsay
5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains. 
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
 2019-07-28 17:31:59 +01:00
deathride58
7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina 
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
 2019-07-17 18:07:57 -04:00
Sishen
b2d5ec8d0c Update action_button.dm 2019-06-30 15:42:04 -04:00
kevinz000
3527664c40 Merge branch 'master' into sprint_stamina 2019-06-16 19:55:56 -07:00
kevinz000
bd335ec3da fix 2019-06-09 02:27:54 -07:00
Ghommie
5a69499927 Hol up, unrelated PR time, atomization. 2019-06-07 01:32:15 +02:00
kevinz000
46c548272c move stuff 2019-05-29 23:14:55 -07:00
kevinz000
b5c699cea8 adjustments 2019-05-25 21:57:25 -07:00
kevinz000
5d40d4b9a2 sprint stamina stuff 2019-05-22 12:18:47 -07:00
kevinz000
2ad8348a55 Merge pull request #8189 from deathride58/widescreenactionbuttons 
Makes action buttons fill the entire screen on widescreen and other weird view sizes
 2019-04-06 19:13:30 -07:00
deathride58
b592297ed1 Makes action buttons stretch to fill the entire screen when widescreen is enabled 2019-03-31 17:16:24 -04:00
Poojawa
b11e3bbc96 Vore mode button and feeding 2019-03-25 04:19:00 -05:00
deathride58
cbc21fe8db okay, let's watch the population drop - adds a config option that makes all stamina buffer actions free (TG-style gameplay) (#7608) 
* "sTAM BAD REE" is like sandpaper on my nerves. so let's turn the server into a TG clone for a week and watch as the population dwindles to nothing just to prove a point!

* and the config, too
 2018-11-09 19:10:20 -08:00
Poojawa
c8aec05ee9 Fixes mood hud missing with one weird trick 
coders hate this!
 2018-09-23 01:22:47 -05:00
Poojawa
07cb9572bd Onclick 2018-09-11 01:33:01 -05:00
Unknown
054be386de readded defines; tweaked size 2018-08-08 12:39:19 +02:00
Unknown
9ca7e38f7a Blurry eyes just got blurrier 2018-08-08 11:42:30 +02:00
kevinz000
2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
63013f8964 everything to controllers 2018-07-02 00:10:31 -04:00
Jordan Brown
16d5991dd6 Merge pull request #38308 from Cruix/multicamera_floor_plane 
Moved picture-in-picture objects down to the floor plane
 2018-06-07 08:42:04 -05:00
Cruix
9c4f4ce17f AI Multicamera mode (#37695) 
* Added multicamera mode for AIs

* Minor multicamera fixes

* Cameras near an AI multicamera eye now light up red

* Disabled AI multicamera mode without admin intervention

* Fixed AIs being able to use multicamera mode when they should not
 2018-05-31 22:41:48 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
LetterJay
adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486 
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
 2018-05-22 07:18:34 -05:00
Jordan Brown
1766134062 Merge pull request #37943 from AutomaticFrenzy/patch/mind-over-matter 
Fix mindswap forcibly enabling ambient occlusion
 2018-05-21 16:31:21 -05:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00