shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,356 Commits 5 Branches 0 Tags
8149eebb3be857ea1ff34ecf05bdfd4ce744e3d5
Commit Graph

82 Commits

Author SHA1 Message Date
actioninja
f419653c28 functionality 2020-03-28 23:50:06 -07:00
Ghommie
54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +01:00
kevinz000
46823a127b Merge pull request #11335 from Ghommie/Ghommie-cit604 
Made flavor texts into an element datum, appliable to every atom.
 2020-03-10 17:26:20 -07:00
Ghom
48ff2f2cec Merge pull request #11349 from monster860/pixel_erp 
Pixel shifting for ERP
 2020-03-10 18:01:52 +01:00
Ghom
aaf494c66b Update code/modules/mob/mob_defines.dm 
Co-Authored-By: kevinz000 <2003111+kevinz000@users.noreply.github.com>
 2020-03-10 17:37:39 +01:00
Ghommie
0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
monster860
c8535275ce In case it wasn't shitcode enough, makes it reset on move 2020-03-06 22:05:56 -05:00
kevinz000
93d995eb18 k 2020-03-06 10:13:11 -07:00
Ghommie
6de290758b Oh, yea. 2020-03-05 19:07:24 +01:00
kevinz000
c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghommie
698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
Ghommie
315b0a9645 Fixes halved flavor text max length and removing some crappy code. 2020-02-13 14:05:40 +01:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Seris02
e45cc4933c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup 2020-01-27 08:33:38 +08:00
Ghommie
6fe0c57c42 run-extra-times fixes. 2020-01-24 20:48:32 +01:00
Seris02
c2bcbe868e merge conflicts + getting rid of commented code for now 2020-01-21 11:23:33 +08:00
Ghom
7a3f0d140c Merge pull request #10468 from Citadel-Station-13/stop-ghosting 
ghosting no longer makes it so you don't count for abductors
 2020-01-21 02:26:25 +01:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00
kevinz000
f1a4956afc easier for me to type 2020-01-10 13:26:34 -08:00
deathride58
6f2cf0b636 [s] adds a cooldown to area creation attempts 2020-01-07 10:04:09 -05:00
kevinz000
ae73927b67 patches 2020-01-07 02:39:16 -08:00
kevinz000
8a29c5a7a9 Update mob_defines.dm 2020-01-07 02:20:44 -08:00
kevinz000
b4736febcf uhh 2020-01-04 13:02:23 -08:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Useroth
ea4f57beb6 Spaghettid my way around the errors. 2019-12-08 16:47:21 +01:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
deathride58
48a0157608 makes it plausible to hear most sounds while inside of a VR sleeper (#8034) 2019-02-22 06:09:54 -08:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Tad Hardesty
83a4003660 Move throwforce up to atom/movable (#38689) 2018-06-26 15:27:09 -05:00
CitadelStationBot
2a727c6df2 [MIRROR] Removes unused overview code. (#7054) 
* Merge pull request #38361 from AnturK/yeahno

Removes unused overview code.

* Removes unused overview code.
 2018-06-10 12:31:19 -07: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
Poojawa
832f071b59 mob stuff 2018-04-23 02:26:53 -05:00
AnturK
80e046572f Allows traitor AI's to take direct control of turrets. (#36154) 
* Allows traitor AI's to take direct control of turrets.

* Adds some icons
 2018-03-17 07:53:01 -05:00
CitadelStationBot
a2e6253f00 [MIRROR] Disease antagonist (#5815) 
* Disease antagonist

* Update mobs.dm

* can I go to sleep yet
 2018-03-05 15:20:59 -06:00
Cruix
558b87ce65 Fixed instant summon behavior with simple animals (#35780) 
Removed hand slots from lots of things that should not have them
 2018-02-19 22:08:01 -06:00
coiax
6d9e8110f5 Mobs start with a random nutrition amount 2018-01-26 19:56:09 -06:00
LetterJay
85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
ShizCalev
cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
Leo
90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup 
Cleans up unused mob vars
 2018-01-23 06:44:32 -06:00
Jordan Brown
e84617f17b Datum var cleanup (#34314) 
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
 2018-01-21 21:39:46 -06:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -06:00
Jordan Brown
edfa926886 Move a definition to the right file (#34288) 2018-01-11 21:31:13 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
deathride58
85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
ShizCalev
7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
deathride58
bdd460ed4a mob folder - root 2018-01-04 01:02:04 -05:00