cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,096 Commits 29 Branches 2 Tags
581fb68bcb2ff00a19b29f03f5043772893ea710
Commit Graph

1271 Commits

Author SHA1 Message Date
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TullyBurnalot
0b94dc3a54 Fied Tiger's recommendations 
- Removed needles src. Again.
- Replaced  istype(W, /obj/item/weapon/wrench) with iswrench(W)
 2016-07-08 03:03:37 +01:00
TullyBurnalot
adab2c06e0 Fixes Comfy Chair Deconstruction 
- Deconstructing Comfy Chairs now yields 2 metal sheets
 2016-07-08 02:49:15 +01:00
TullyBurnalot
2dce5ec8f1 Bureaucracy Update 
- Added Fax Guide to NT Rep, IAA, Captain, HoS and HoP Lockers
- Added Tape Box, with 6 Tapes, to NT Rep and IAA Office
- Added Recorder to NT Rep Locker
- Printers now start off with 60 toner
- Printers now alert nearby people when butts are copied
 2016-07-07 20:24:07 +01:00
Kyep
de77c072fb Makes capital crime options consistent 2016-07-06 23:13:56 -07:00
Mieszko Jędrzejczak
8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
TullyBurnalot
9793fc4b18 Resisting out of unwelded lockers is now possible 
Fixes #4880. Sorta.

- Can now resist out of unwelded lockers instantaneously
- By association, can now resist out of closed cardboard boxes

You can also use Toggle Open, this is just faster.
 2016-07-06 21:22:28 +01:00
Fox-McCloud
119c76ab0e Faster Get Turf from VG 2016-07-05 02:40:05 -04:00
Crazylemon64
ac3db33709 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-04 14:54:49 -07:00
Crazylemon64
2c4d8e9b6a You can now load the cyberiad runtime-free 2016-07-03 15:36:38 -07:00
TheDZD
9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance 
TG Armor Rebalance
 2016-07-02 19:26:41 -04:00
Fox-McCloud
17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
Fox-McCloud
1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
Tigercat2000
567e1576f5 Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/modules/client/preference/preferences_toggles.dm
 2016-06-30 17:40:10 -07:00
Fox-McCloud
2df7ff16d8 Fixes Sound/Debug Preferences 2016-06-30 10:57:58 -04:00
Tigercat2000
82091296bd Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preference/preferences.dm
	code/modules/client/preference/preferences_toggles.dm
 2016-06-27 08:20:49 -07:00
Krausus
eecf8ba93b to_chat fixes 
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
 2016-06-24 18:36:50 -04:00
Aurorablade
b93fef2369 snek? snek?! SNEEEKEKKKKKK!!!!! (#4759) 
* snek? snek?! SNEEEKEKKKKKK!!!!!

* PLANT ops
 2016-06-24 11:30:54 -04:00
TheDZD
7c602b5e54 Merge pull request #4743 from FalseIncarnate/bug_fix 
Stool-fu
 2016-06-24 08:32:07 -04:00
FalseIncarnate
42e624cb39 4 character commit 
really.
 2016-06-23 21:09:08 -04:00
monster860
e510106a85 Merge branch 'master' into vg-parallax 2016-06-23 19:19:32 -04:00
tigercat2000
732c3b4ae5 Goonchat (#4744) 
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
 2016-06-23 16:56:15 -04:00
TheDZD
5e2d7920c7 Merge pull request #4713 from DaveTheHeadcrab/engineer_workboots 
Engineer Workboots
 2016-06-22 14:03:04 -04:00
FalseIncarnate
fef4ae6c0c Stool-fu 
Stools can once again be picked up during impromptu bar brawls. Show
them who the real tough-guy is!

🆑
bugfix: To save on adhesive costs, Nanotrasen has stopped gluing stools
to the floor. The resulting bodily injuries probably won't cost more.
/🆑
 2016-06-21 19:09:16 -04:00
monster860
120e470458 Ports /vg/ parallax 2016-06-21 14:58:49 -04:00
Aurorablade
a02a38b6e9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-06-21 07:42:29 -04:00
Tigercat2000
5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping 
Conflicts:
	code/modules/client/preference/preferences.dm
 2016-06-19 16:28:57 -07:00
TheDZD
931f25c5f4 Makes it so lockers are no longer a safe place to hide from Lord Teslaloth (#4704) 2016-06-19 14:28:08 -04:00
FalseIncarnate
ae70a7fc69 Bug Fixes (#4714) 
* Bug Fixes

Fixes #4616
- All ladders are now anchored and cannot be dragged, including dive
points.

Fixes #4663
- Trying to fill a full container from a toilet will inform you the
container is full, and thus fail.

Fixes #4705
- Being gibbed/dusted/melted will unbuckle the victim prior to their
gruesome fate, allowing their spirit freedom to no longer haunt the
buckles that bound their mortal form.

* Because apparently we shouldn't trust people to use "delete" properly
 2016-06-19 13:24:58 -04:00
TheDZD
4df4b58bc1 Merge pull request #4687 from Fox-McCloud/crouching-warden-hidden-greytide 
Gives Warden Krav Maga Gloves
 2016-06-19 13:13:11 -04:00
SamCroswell
cbcf30335f Boots for Atmos Techs! 2016-06-18 22:17:16 -04:00
SamCroswell
3e25608535 Engineer Workboots 2016-06-18 22:08:59 -04:00
DaveTheHeadcrab
0c12ef1c0a Security Armor Update (#4660) 
* Revert "scanner icon"

This reverts commit 86a7b5cf4f.

* Sec Armor Update
 2016-06-17 11:17:56 -04:00
Fox-McCloud
b89364e1df Gives Warden Krav Maga Gloves 2016-06-15 17:15:58 -04:00
Tigercat2000
599527a480 Add skirts to wardrobe lockers. 2016-06-13 21:13:10 -07:00
TheDZD
de7bf10447 Merge pull request #4620 from Fox-McCloud/mai-tables 
Nerfs Tabling
 2016-06-11 11:47:20 -04:00
Fox-McCloud
4fa4b253ef Nerfs Tabling 2016-06-08 02:14:06 -04:00
Aurorablade
e1dc621ab8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-06-01 00:12:37 -04:00
TheDZD
f7d4cbe108 Fixes paths, snipers, turrets, mechas, some other things. 2016-05-31 22:50:59 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
Aurorablade
0ac1a0f759 code'sie has risen 2016-05-29 23:37:40 -04:00
Tastyfish
9eba1f2bef Makes glass tables drop 2 glass 2016-05-28 15:56:20 -04:00
Aurorablade
ffb0201a25 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-05-21 21:59:29 -04:00
Fox McCloud
3b30dae4a0 Merge pull request #4455 from razekpraxis/Paradise_LockClick 
Adds a click sound when you lock a locker
 2016-05-19 19:15:27 -04:00
Razek
8efc712b71 fixed 2016-05-18 09:07:59 +01:00
Razek
9144289780 Adds a click sound when you lock a locker. (I was so bored.) 
Signed-off-by: Razek <megamattman2234@hotmail.co.uk>
 2016-05-17 18:02:39 +01:00
Tastyfish
ef3859203b Makes is_mechanical() use OOP, removes bizarre is_active() 2016-05-17 07:25:52 -04:00
Aurorablade
c3ee3192ba last of tg tweaks for now. 
rune blood dna is runtiming but eh....
 2016-05-15 23:09:48 -04:00
Aurorablade
a44086c39a FALSE HALP 2016-05-13 00:48:54 -04:00
Aurorablade
f99a8141c5 TG Ports and datum cult screwups 2 
I may have missed something
 2016-05-11 20:15:36 -04:00