cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,269 Commits 26 Branches 2 Tags
74f7028fa73bf24f21e36bb01b6721b61fa90bff
Commit Graph

4409 Commits

Author SHA1 Message Date
Crazy Lemon
74f7028fa7 Merge pull request #9177 from datlo/RSFfix 
Fixes Service Borg's RSF being unable to dispense items on floors
 2018-07-11 12:43:30 -07:00
Fox McCloud
9463807ac2 done 2018-07-09 05:45:01 -04:00
Fox McCloud
27ebe7a6fe Standardized Robotic Organ Checking--Removes Mechassited Organs 2018-07-07 21:33:42 -04:00
datlo
0e9b583caf Combined table and floor check 2018-07-07 07:50:31 +01:00
tigercat2000
fcdb0fe54b Merge pull request #9172 from Fox-McCloud/no-lances 
Removes Explosive Lances
 2018-07-06 15:01:07 -07:00
datlo
e4215cf0f5 Actually allows RSF to spawn on floors 
derp'd
 2018-07-06 06:57:53 +01:00
datlo
d26b4c4e7e Allows RSF to spawn items on floors 2018-07-06 06:37:52 +01:00
datlo
84ae085166 Changes RSF error message to be more accurate 
The RSF cannot, in fact, create service items on floors. As amusing as
dosh on every floor tile would be, I think it's best to just change the
message and not functionality.
 2018-07-05 16:10:53 +01:00
tigercat2000
9697bd082f Merge pull request #9171 from Citinited/jon-is-no-longer-custom 
Fixes spelling error
 2018-07-03 15:47:57 -07:00
Fox McCloud
319a6cd500 Removes Explosive Lances 2018-07-03 18:13:51 -04:00
Citinited
a7dc1d70e9 Fixes speling error 2018-07-03 16:30:30 +01:00
MINIMAN10000
868167d84c Fix cardboard drop count 2018-06-19 13:38:02 -07:00
Fox McCloud
8dcc35edd5 Fixes Home-Run Bat Charge 2018-06-18 16:48:12 -04:00
Kyep
412341439a Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992) 
* Fixes #8954

* projectile reagetns

* removes all attack logs on keyless simple_animals even by keyed mobs

* deletes 'potentially'

* Tiger request

* more comprehensive solution

* check for mob

* istype

* brevity

* Split attack logs preference

* toggle

* deletes old CHAT_ATTACKLOGS

* explains what levels do when toggling them

* clarification

* Tigercat requests
 2018-06-13 16:55:21 -07:00
tigercat2000
4e758344d3 Merge pull request #9050 from Fox-McCloud/weather-subsystem 
Converts and Updates Weather Subsystem
 2018-06-13 16:08:02 -07:00
Fox McCloud
124f1518ce Merge remote-tracking branch 'upstream/master' into two-handed 
# Conflicts:
#	code/game/objects/items/weapons/twohanded.dm
 2018-06-13 17:29:37 -04:00
tigercat2000
32f7e22005 Merge pull request #9080 from Fox-McCloud/medbot-clean-up 
Cleans Up Medibot Code, Re-Allows Syndicate Medibot
 2018-06-13 13:57:05 -07:00
Fox McCloud
5fb13096a2 Merge remote-tracking branch 'upstream/master' into weather-subsystem 
# Conflicts:
#	code/__DEFINES/layers.dm
 2018-06-13 16:56:19 -04:00
Fox McCloud
4531bc2337 tweaks 2018-06-03 19:26:48 -04:00
Fox McCloud
7f2f766f70 Merge remote-tracking branch 'upstream/master' into attack-hulk 
# Conflicts:
#	code/game/objects/structures/window.dm
 2018-06-03 18:49:44 -04:00
uraniummeltdown
75bded82cf added defines for window construction states and full window diagonal dir 
added a proc to check for valid window location, added var/fulltile to windows instead of using a proc
added clockwork windoors and windows to brass recipes
added titanium glass and plastitanium glass, made glass types use recipes like other stacks, you can smelt the new glasses in the ORM
removed force from RCD and added NOBLUDGEON flag, fixing a bug where you couldn't deconstruct airlocks with an RCD
slight nerf to wielded fireaxe, does high damage to windows and grilles instead of insta-deleting them
deleted fullwindow.dm and moved windows to window.dm
added some feedback to placing glass on grilles
examining windoor assembly shows you can rotate it, examining windows show deconstruction hints and rotation
added cracks to windows, you can repair windows using a welding tool on help intent, slight buff to window health
added var/cancolor to windows and blacklists some windows from being auto-colored, window shards also get colored on narsie_act()
full windows now use icon smoothing system, windows now use the obj_integrity damage system
added is_glass_sheet() helper
 2018-06-03 13:11:37 +04:00
tigercat2000
49e49591a1 Merge pull request #9075 from Anasari/AttackLogImprove 
Improved (ish) attack log logging
 2018-06-01 20:52:42 -07:00
Fox McCloud
202fbe92fb Cleans Up Medbot Code, Re-Allows Syndicate Medbot 2018-05-29 12:15:04 -04:00
Ansari
ab3a96b1ec Add antag 2018-05-27 20:37:07 +08:00
Fox McCloud
ed9915edd9 Merge remote-tracking branch 'upstream/master' into two-handed 
# Conflicts:
#	code/game/objects/items/weapons/twohanded.dm
 2018-05-26 19:05:17 -04:00
Tayyyyyyy
bc977804de Small fixes 2018-05-25 18:39:38 -07:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
98c6ddf5a7 Fix his, he, him 2018-05-25 18:34:28 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy
c80704e724 Conjugating verbs is hard 2018-05-25 18:34:23 -07:00
Tayyyyyyy
170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Tayyyyyyy
ad0da70305 Punches 2018-05-25 18:34:22 -07:00
Tayyyyyyy
497072d4d1 Update pronoun usage 2018-05-25 18:34:22 -07:00
tigercat2000
ea44afdebe Merge pull request #9025 from Anasari/BombToInvestigate 
Move bombing list to investigate & improve bomb logging
 2018-05-25 17:58:13 -07:00
Ansari
827503b0a4 EMP now provide coordinates and allow you to jump to it. Most EMP instance except for the Experimentor and the Singularity are now logged. 2018-05-23 18:33:12 +08:00
Fox McCloud
6cdfe70303 Converts and Updates Weather Subsystem 2018-05-21 00:01:18 -04:00
Fox McCloud
a87170255b Makes Hulk Attacking Less Snowflakey 2018-05-19 02:32:34 -04:00
Ansari
dd417c006b Uses define instead of "bombs" for styling reason. Fixes IED not logging into investigate due to its special mechanism. 2018-05-18 12:23:08 +08:00
tigercat2000
1cfc3f27c8 Merge pull request #8974 from Fox-McCloud/holo-projector 
Ports Holoprojectors
 2018-05-17 20:19:13 -07:00
Ansari
792f3ada27 Fixes spacing 2018-05-18 07:05:05 +08:00
Ansari
2e870f8038 Remove all instance of bombers. Replace "bomber list" in secrets with "bombs" in investigate. Remove useless clear bomb function. 2018-05-17 23:14:29 +08:00
Fox McCloud
66ee8fa0b6 spelling 2018-05-14 21:47:23 -04:00
Crazy Lemon
63ec546a0a Merge pull request #9008 from Fox-McCloud/remove-mode 
Removes All Modes
 2018-05-14 17:49:58 -07:00
Fox McCloud
b3524505b5 tweak 2018-05-14 17:51:13 -04:00
Fox McCloud
f521f2765c Removes All Modes 2018-05-11 17:55:45 -04:00
tigercat2000
254cdd6055 Merge pull request #8972 from Fox-McCloud/power-cell 
Power Cell Code Cleanup
 2018-05-09 11:26:03 -07:00
Fox McCloud
8845262d65 Merge remote-tracking branch 'upstream/master' into holo-projector 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
#	paradise.dme
 2018-05-04 16:37:24 -04:00
tigercat2000
8071b42308 Merge remote-tracking branch 'upstream/master' into more_ss_ports 
# Conflicts:
#	code/modules/food_and_drinks/food/snacks.dm
 2018-05-03 19:30:41 -07:00
Fox McCloud
8bd042240f Power Cell Code Cleanup 2018-05-02 19:35:18 -04:00