cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 07:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,798 Commits 26 Branches 2 Tags
ec4add0ebfa3a02003fc6abfb801a88dfdca56e8
Commit Graph

414 Commits

Author SHA1 Message Date
Crazy Lemon
37a7484976 Merge pull request #6149 from FlattestGuitar/log-upgrade 
Adds log stacking to admin logs
 2017-01-18 19:13:50 -08:00
Mieszko Jędrzejczak
1b506aaf9f Switches over to the new system 2017-01-17 13:57:07 +01:00
Aurorablade
c014e72979 AND YOU GET A PARENT CALL AND YOU GET A PARENT CALL AND YOU 2017-01-09 02:31:44 -05:00
Aurorablade
98b7a89a17 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 
# Conflicts:
#	code/game/machinery/doors/airlock.dm
 2016-12-29 11:01:43 -05:00
Crazylemon64
c0cd2c263f Switches reset_view to reset_perspective 2016-12-21 17:59:08 -08:00
Crazylemon64
6d3e66f41c Polishes up the reset_view proc, which is basically 
`reset_perspective` from tgstation.

Also adds various support for remote viewing lenses - like cameras not
transmitting xray vision, among other things

Recommit because we're using different compiler versions
 2016-12-21 17:56:57 -08:00
Aurorablade
23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Aurorablade
78eb685ac6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-12 20:25:48 -04:00
Markolie
514222b6d7 Fixes silicons not having their antag powers/antagHUD removed properly. Fixes traitors/abductors not having their antagHUD added at roundstart. 2016-10-09 16:36:09 +02:00
Aurorablade
e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Aurorablade
2c104adaf3 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-01 00:43:50 -04:00
Crazylemon64
16dd4e9d21 Moves many uses of log_to_dd to log_runtime, to make the output 
more visible at runtime, to someone who isn't watching DD first-hand
 2016-08-24 09:55:19 -07:00
Aurorablade
5eb351897a yay! 2016-08-23 01:36:25 -04:00
Aurorablade
47dc3a3051 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-16 02:23:20 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor 
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
 2016-08-01 21:29:19 -07:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Aurorablade
bb840f4dce Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-07-21 23:56:34 -04:00
TheDZD
7fa74a1d1e Re-adds PDA slot 2016-07-21 13:04:02 -04:00
Fox-McCloud
0a8dca713c proper ear damage proc 2016-07-21 04:24:12 -04:00
Fox-McCloud
1ac09a962c Cleans up Vars 2016-07-21 01:43:16 -04:00
Fox McCloud
a28ae804b9 Merge pull request #5086 from FreeStylaLT/assholewizards 
Makes Wizards get only a special "fuck their shit up" objective
 2016-07-18 20:03:57 -04:00
TheDZD
3901b47c0c Merge pull request #5087 from Fox-McCloud/wiznerd-fix 
Fixes Wizard Satchel Equipping (And Spellbook tweak)
 2016-07-18 20:02:44 -04:00
Fox-McCloud
38b0bdba08 Fixes Wizard Satchel Equipping (And Spellbook tweak) 2016-07-17 11:26:01 -04:00
FreeStylaLT
deccfd6a24 Replaces hijack with an open-ended objective to wreck some shit up 2016-07-17 16:40:54 +03:00
FreeStylaLT
45df59e091 Makes Wizards only get Hijack objective 2016-07-17 15:42:27 +03:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Fox McCloud
5107bca5dd Merge pull request #4899 from FlattestGuitar/loadouts 
Did someone say "loadouts"?
 2016-07-15 11:25:34 -04:00
SamCroswell
e139f81412 PDA Slot Removal + PDA ID Changes 2016-07-15 00:54:14 -04:00
Fox-McCloud
a78c6cbf5d changes 2016-07-11 22:45:44 -04:00
Fox-McCloud
762ed61881 Adds in Rathen's Secret 2016-07-10 20:04:17 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
Mieszko Jędrzejczak
8f5ddf2be1 Fixes conflicts, conflicts. 2016-07-10 13:03:01 +02:00
TheDZD
0617cad287 Merge pull request #4944 from Fox-McCloud/cursed-heart 
Ports TG's Cursed Hearts
 2016-07-09 21:02:31 -04:00
Fox McCloud
c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets 
The Honkening
 2016-07-09 18:29:11 -04:00
Fox-McCloud
9544d8409f Ports TG's Curesed Hearts 2016-07-08 20:51:08 -04:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TheDZD
52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
TheDZD
2df88fcdb5 Fixes and changes 2016-07-06 21:49:26 -04:00
Mieszko Jędrzejczak
8e0ac813ae Loadouts 2016-07-06 22:26:42 +02:00
TheDZD
551b2aefbd Remove some shit from Life(), and fix wiznerd thing 2016-07-03 15:51:43 -04:00
Fox-McCloud
3f31744255 Ports TG's Laughter Demon 2016-06-29 10:39:20 -04:00
LittleBigKid2000
a271149a06 Fixes the contract and blood bottle only refunding for 1 point (#4770) 
The apprenticeship contract and blood bottle cost 2 points, but you only
get 1 point when feeding them back into your spellbook.
 2016-06-24 18:30:30 -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
Aurorablade
a02a38b6e9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-06-21 07:42:29 -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