cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-05-14 02:40:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
39,490 Commits 12 Branches 2 Tags
d359d6bbcbe2488ffa952f18d7959cd884e0445a
Commit Graph

2278 Commits

Author SHA1 Message Date
variableundefined 721a7656d2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into NPCPoolPort 2018-10-01 16:34:47 +08:00
Crazy Lemon ca26739109 Merge pull request #9477 from variableundefined/SSPortShuttle 
Port Shuttle to StonedMC
 2018-10-01 01:13:42 -07:00
variableundefined 3f3194598d Merge pull request #9642 from SamHPurp/span-span-span-span 
Fixes a bunch of message formatting overflows
 2018-09-30 08:30:49 +08:00
Purpose 6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
variableundefined f67fabd082 I am a genius 2018-09-29 21:37:15 +08:00
Crazy Lemon 1bdf3cc38d Merge pull request #9628 from variableundefined/GearSpawn 
Stop you from losing your memory and money at roundstart
 2018-09-28 09:15:50 -07:00
variableundefined 35342aa4cb Actually follow up with assignrank 2018-09-28 18:37:07 +08:00
Birdtalon ffe2b5f27a adds additional check for protected jobs in one-click-antag 2018-09-22 17:50:24 +01:00
variableundefined 7f32200f78 Fixes special char being allowed in some name 2018-09-11 13:33:39 +08:00
Crazy Lemon cacd50a2e8 Merge pull request #9359 from Aurorablade/Formatting 
Formats the HM in player panel
 2018-09-04 09:22:10 -07:00
variableundefined bc22544919 Port Shuttle to StonedMC 2018-09-02 22:22:33 +08:00
variableundefined 1e8e909847 Actually port it over properly. Also port NPCAI to StonedMC. 2018-09-01 11:31:42 +08:00
Unknown dc0df1df66 fixes admin prison 2018-08-28 10:39:06 +02:00
Crazy Lemon a94375bcb2 Merge pull request #9366 from variableundefined/LogPrayer 
Add logging to prayer
 2018-08-27 18:37:17 -07:00
variableundefined 37d0056e0f Fixes a runtime with admin ticket 2018-08-19 13:37:54 +08:00
variableundefined 903eaf952b Add prayer to logg 2018-08-16 19:52:32 +08:00
Mars 218aa2402d Macro usage 2018-08-15 22:27:53 +02:00
Aurorablade 14469c35c9 Formats the HM 2018-08-14 21:30:01 -04:00
Mars a5c9cfd1cb Fixes and polishes fax radio replies 
Can use the radio option to reply to faxes again.
Centcomm doesn't reply over radio to syndicate faxes.
Removes unreachable code.
 2018-08-12 12:00:32 +02:00
Crazy Lemon efb582412d Merge pull request #9298 from Aurorablade/Headsets 
Slight TG Headset Communication port
 2018-08-05 11:30:50 -07:00
Aurorablade b81f61ae58 Fixes 2018-08-04 23:27:20 -04:00
Aurorablade e8bb3451db Stop making Late night PRs fethas 2018-08-02 02:22:02 -04:00
variableundefined 9c2e725e4b Fixes some more runtime 2018-08-01 17:44:09 +08:00
Crazylemon64 ed05c2ec45 Explosion buildmode now works 2018-07-26 22:07:42 -07:00
Crazylemon64 cbd52db2be A couple buildmode fixes 
The runtime when not placing a valid path is now replaced with a warning
message

The HUD icon for buildmode is no longer covered up by item actions
 2018-07-26 21:47:40 -07:00
Fox McCloud 7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
Fox McCloud 25b53a8a6e eh 2018-07-13 18:17:42 -04:00
Fox McCloud 5f31b03972 splitting 2018-07-13 18:09:16 -04:00
Fox McCloud 67d12c0aa6 Full Positronic Brain to Robotic Brain Refactor 2018-07-12 19:30:48 -04:00
tigercat2000 f31d79a961 Merge pull request #9064 from Anasari/MoreClickAntag 
One-click antag improvement. Antag-related refactor, memory confirmation & typo fixing
 2018-06-13 18:43:18 -07: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
Anasari d9d9857f57 Remove redundant src and upper limits 2018-06-14 07:23:40 +08: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
tigercat2000 49ef4be0e6 Merge pull request #9051 from Anasari/ConfirmationPossess 
Add confirmation prompt to possess object
 2018-06-13 13:27:11 -07:00
tigercat2000 2d9d4d51e1 Merge pull request #9002 from Kyep/ds_fix 
DS / prefs fix
 2018-06-08 11:59:05 -07:00
tigercat2000 b9a6383188 Merge remote-tracking branch 'upstream/master' into tcomms_optimize 
# Conflicts:
#	code/game/machinery/telecomms/telecomunications.dm
 2018-06-07 15:04:57 -07: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
Ansari c461a5d95a Refactor out some of the boilerplate candidacy check code. Just some. 2018-05-26 12:44:38 +08:00
tigercat2000 baf5fe64a7 Merge pull request #8967 from Tayyyyyyy/pronouns 
Pronouns!
 2018-05-25 19:39:11 -07:00
tigercat2000 9e54ca5dc2 Merge pull request #9054 from Tayyyyyyy/ticket_bleed_fix 
Fix ticket bleed
 2018-05-25 19:33:31 -07:00
Tayyyyyyy 50aceae04d Revert unwanted style change 2018-05-25 19:02:13 -07:00
Tayyyyyyy 919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy 170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Ansari f381b7516c Early return. 2018-05-26 09:09:41 +08:00
tigercat2000 292f375105 Merge pull request #9033 from Tayyyyyyy/amoji 
Enable emojis for asay and msay 🎉
 2018-05-25 18:06:00 -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 0c494e4fab Confirmation prompt for wiznerd and abductor. List number of antag that someone attempted to create consistently. 2018-05-24 23:15:12 +08:00
Ansari c932143938 Fixes cultist, remove redundant confirmation. Add confirmation prompt to other. Add option to adjust number for vox raiders 2018-05-24 09:58:07 +08:00