shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,417 Commits 5 Branches 0 Tags
c1a3dc1c1e08068cfbe039a052d4a95c4fc84b51
Commit Graph

3869 Commits

Author SHA1 Message Date
LetterJay
c1a3dc1c1e Update cameranet.dm 2017-09-21 06:33:36 -05:00
oranges
41277ff110 Removes old debug text 2017-09-21 06:30:11 -05:00
Poojawa
aec48daa0a Ashdrake noms (#2868) 
* Initial commit

* probably a better way to check this

* It compiled boys. Let's see if it works.

* IT WAS ALL NULLS, BOYS

* Hooray, it's not broken anymore boys!

* Well it works, but we need transfer IDs to work

locating them post-initialize would help, probably. Then assigning their
links soon after.

* Bellies linked, autotransfer, LoseTarget

* half-thought sanity check needs to go away

* A few last minute tweaks.
 2017-09-21 06:29:08 -05:00
LetterJay
5b38d23bfd oops 2017-09-21 02:28:37 -05:00
LetterJay
bb837fe20e donation item 2017-09-20 04:57:57 -05:00
CitadelStationBot
accd92a676 [MIRROR] Fixes mode conversion runtime (#2855) 
* Fixes mode conversion runtime (#30857)

* Fixes mode conversion runtime
 2017-09-20 01:40:52 -05:00
Poojawa
6d717995a4 Update meteors.dm (#2867) 2017-09-20 01:40:09 -05:00
Poojawa
5b6be1bc44 wew, memes. (#2869) 2017-09-20 01:39:46 -05:00
CitadelStationBot
51786b346e [MIRROR] Fixes it so Deadmin properly hides the Player Panel verb for admins. (#2861) 
* Fixes it so Deadmin properly hides the Player Panel verb for admins.

* Update admin_verbs.dm
 2017-09-20 01:04:13 -05:00
CitadelStationBot
6e79861679 [MIRROR] fix black box runtimes (#2863) 
* fix black box runtimes

* fix black box runtimes
 2017-09-20 01:03:17 -05:00
CitadelStationBot
84f108a68b [MIRROR] Fix pipenets (#2860) 
* Fix pipenets

* Fix pipenets
 2017-09-20 01:02:33 -05:00
Poojawa
4ab7f126ed Vore system updates (#2864) 
* Tasting, digest/transfer chance, improvements

* more vague for defaults

* Actually let's hold off on silenced mode 'cuz broke

* make sure it's all commented out

* reverts vorepanel updater, buggy af. Adds mob vore

Ian can eat you now. \o/
 2017-09-19 14:03:13 -05:00
LetterJay
b4e6519b51 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-19 12:32:31 -05:00
LetterJay
7c626edca4 fk u 2017-09-19 12:32:10 -05:00
LetterJay
50e9dd17b6 Merge pull request #2801 from Citadel-Station-13/upstream-merge-30745 
[MIRROR] Dice will now roll when thrown
 2017-09-19 12:20:34 -04:00
LetterJay
5f759c7c3f Merge pull request #2858 from Citadel-Station-13/upstream-merge-30859 
[MIRROR] Fixes safes not having adjacency checks
 2017-09-19 12:19:59 -04:00
LetterJay
e410b452ea Merge pull request #2817 from Michiyamenotehifunana/master 
Adds Anti Tank pistols
 2017-09-19 12:15:01 -04:00
kevinz000
7c0e17236d Fixes safes not having adjacency checks (#30859) 
* Update safe.dm

* Update safe.dm
 2017-09-19 10:56:51 -05:00
LetterJay
51007614e6 sql fix 2017-09-19 09:24:43 -05:00
CitadelStationBot
fd2e1c896f [MIRROR] Fixes incorp move runtimes on border movement. (#2774) 
* Fixes incorp move runtimes on border movement.

* Update mob_movement.dm

* Update mob_movement.dm
 2017-09-19 07:00:54 -05:00
CitadelStationBot
ecce4cf138 [MIRROR] New DCS signals (#2741) 
* New DCS signals

* Update atoms.dm

* actually ports comsigs
 2017-09-19 07:00:08 -05:00
CitadelStationBot
628a2442e2 [MIRROR] Slightly remaps and adds more supplies to the animal hospital ruin (#2705) 
* Merge pull request #30505 from Xhuis/vet_remap

Slightly remaps and adds more supplies to the animal hospital ruin

* Slightly remaps and adds more supplies to the animal hospital ruin
 2017-09-19 06:37:56 -05:00
CitadelStationBot
3afe490be3 [MIRROR] Fixes bees attacking apiaries (#2772) 
* Fixes bees attacking apiaries

* Update bees.dm
 2017-09-19 06:37:30 -05:00
Poojawa
b6fdbb54f5 Update dice.dm 2017-09-19 06:35:36 -05:00
CitadelStationBot
170f5d7a5e [MIRROR] Log file for PDA messages (#2848) 
* log file for pda messaegs (#30827)

* Log file for PDA messages
 2017-09-19 06:34:53 -05:00
CitadelStationBot
e1aa96ad64 [MIRROR] Remove unused check_pressure proc (#2852) 
* Remove unused check_pressure proc (#30853)

* Remove unused check_pressure proc
 2017-09-19 06:24:47 -05:00
CitadelStationBot
9c9020ec32 [MIRROR] Removes dead testing code (#2854) 
* Merge pull request #30860 from ninjanomnom/quickfix

Removes dead testing code

* Removes dead testing code
 2017-09-19 06:24:12 -05:00
Michiyamenotehifunana
1f84944dee Anti Tank Pistol Improvements and Implementation 
Fixes the issues with the ATP, modifies its sprite slightly, and adds it to the nukeops uplink list.
 2017-09-18 23:11:14 +08:00
LetterJay
19309d76d0 Merge pull request #2840 from Citadel-Station-13/upstream-merge-30344 
[MIRROR] Traitorbro gamemode
 2017-09-18 08:35:00 -04:00
CitadelStationBot
1edd7b82d1 [MIRROR] Minor weather code split/refactor (#2837) 
* Minor weather code split/refactor

* Delete weather_types.dm

* Update radiation_storm.dm
 2017-09-18 01:46:41 -05:00
CitadelStationBot
d4a577014a [MIRROR] Fixes esaw icon (#2831) 
* Fixes esaw icon

* Update energy.dm
 2017-09-18 01:46:20 -05:00
CitadelStationBot
d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813) 
* Stops AIs from taking actions while depowered

* Update ai.dm
 2017-09-18 01:45:59 -05:00
CitadelStationBot
4bc6e9d522 [MIRROR] Cleaned up some decimal values. (#2797) 
* Cleaned up some decimal values.

* Update gas_mixture.dm

* Update color.dm

* Update medsci.dm
 2017-09-18 01:45:39 -05:00
CitadelStationBot
83ec9b6d26 [MIRROR] Cleans up showcase & plaque varedits, updated loyalty implant references (#2768) 
* Cleans up showcase & plaque varedits, updated loyalty implant references (#30698)

* Cleans up showcase varedits

* drop_location for oldpods

* Plaques + more loyalty implant references

* Cleans up showcase & plaque varedits, updated loyalty implant references
 2017-09-17 23:07:05 -05:00
Poojawa
7bfa8b1a9a Changes Hulk allowed species to fly from 'oomie (#2819) 
Changes Hulk allowed species and fixes SE issues
 2017-09-17 23:06:23 -05:00
CitadelStationBot
680e9e9697 [MIRROR] Quick pAI software buying tweak (#2825) 
* Added the thing that Cruix wanted

* Quick pAI software buying tweak

* Update software.dm
 2017-09-17 22:59:33 -05:00
CitadelStationBot
7299854f8b [MIRROR] Puts the computer circuit board back in nullspace where it supposedly belongs (#2810) 
* Puts the computer circuit board back in nullspace where it supposedly belongs

* Update _computer.dm
 2017-09-17 22:55:04 -05:00
CitadelStationBot
e2e85e9294 [MIRROR] Window Spawner Refactor (#2815) 
* Window spawner refactor (#30747)

* Window Spawner Refactor
 2017-09-17 22:42:22 -05:00
Poojawa
a9e3deb51a Update hud.dm 2017-09-17 22:38:31 -05:00
Poojawa
d5c012d431 Update role_preferences.dm 2017-09-17 22:38:03 -05:00
Poojawa
a4310ec6a6 Update atom_hud.dm 2017-09-17 22:37:44 -05:00
CitadelStationBot
201cb984c8 [MIRROR] Fix ingredient box icon (again) (#2823) 
* Fix ingredient boxes

* Fix ingredient box icon (again)
 2017-09-17 22:36:21 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
CitadelStationBot
b13f090fe9 [MIRROR] Adds Lavaland items to weapon exports for cargo (#2836) 
* Adds Lavaland items to weapon exports for cargo (#30403)

They're expensive, but those mobs are quite difficult to kill

* Adds Lavaland items to weapon exports for cargo
 2017-09-17 22:32:53 -05:00
CitadelStationBot
99e0463261 [MIRROR] Fixes bluespace golem teleport icon (#2834) 
* Fixes bluespace golem teleport icon

* Fixes bluespace golem teleport icon
 2017-09-17 22:31:55 -05:00
CitadelStationBot
c8b153ee71 [MIRROR] Varedit cleanup mk4 (#2833) 
* Varedit cleanup mk4 (#30794)

* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description

* Varedit cleanup mk4
 2017-09-17 22:31:30 -05:00
CitadelStationBot
76085457d6 [MIRROR] Fix maple shotgun icon_state (#2829) 
* Fix maple shotgun icon_state (#30796)

* Fix maple shotgun icon_state
 2017-09-17 22:26:50 -05:00
CitadelStationBot
8846708727 [MIRROR] Fixes cyborg airlock interaction (#2827) 
* Fixes cyborg airlock interaction (#30809)

* changes the sheet check to respect cyborgs

* Uses the proc instead of a hack that we wound need to fix again

* I can code totaly, yeah, sober...

* I cant posibly be drunk yet i only GOT the wine a minute ago

* Fixes cyborg airlock interaction
 2017-09-17 22:25:59 -05:00
CitadelStationBot
9284bdd205 [MIRROR] Admins in chat are notified if an ahelp is answered in game (#2828) 
* Admins in chat are notified if an ahelp is answered in game (#30638)

* Admins in chat are notified if an ahelp is answered in game

* Further sanity

* Admins in chat are notified if an ahelp is answered in game
 2017-09-17 22:25:43 -05:00
CitadelStationBot
656b9c2810 [MIRROR] Fixes remaining dummy delete runtime. (#2824) 
* Fixes remaining dummy delete runtime.

* Fixes remaining dummy delete runtime.
 2017-09-17 22:23:43 -05:00