cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 5 Branches 0 Tags
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

1239 Commits

Author SHA1 Message Date
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Segrain
cad425f2ca Roundend declaration. 2013-10-17 04:07:29 +03:00
Chinsky
fb0fb4da6a Merge pull request #3759 from Baystation12/dev-freeze 
freeze -> dev
 2013-10-11 11:41:06 -07:00
jack-fractal
6ecab0bc36 - implementing Mloc's suggestions. 
- fixing the changelog
 2013-10-11 13:29:33 -04:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage 
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
 2013-10-11 12:39:54 -04:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Chinsky
92625f8384 Merge pull request #3716 from DJSnapshot/bugfix 
Auto-transfer voting Redux: Episode 2.
 2013-09-30 07:53:49 -07:00
DJSnapshot
f956971fdf Small change to code. (Was locking up game ticker.) 2013-09-29 22:13:58 -07:00
DJSnapshot
1a48a2b6b0 Auto-transfer voting! 2013-09-29 12:05:10 -07:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00
DJSnapshot
caa6cd6c8a votes now show number of votes, no longer mute OOC, and show results. It is no longer possible to call a crew transfer during red/delta alert, and a new proc called autotransfer() has been added, but has yet to have anything to trigger it. 2013-09-24 23:41:21 -07:00
Cael Aislinn
955160e9d6 moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-09-20 13:35:49 +10:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
5d1c4548fa Cell.use checks instead of just minuses. Yay for code! 2013-09-01 00:16:11 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Erthilo
1a0aaebfc1 "Fixes" law 0. 2013-08-28 01:55:02 +01:00
Erthilo
5f68a4c656 Misc formatting errors. 2013-08-27 22:10:47 +01:00
Erthilo
5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Zuhayr
8c58af4c65 Vox theft objectives should check lockers and other storage now. 2013-08-25 02:53:07 -07:00
Zuhayr
d875d3e2f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-24 15:04:38 -07:00
Kilakk
e634cd01f2 Fixes #3517 2013-08-23 14:21:08 -04:00
DJSnapshot
4bd67e83b8 Changed vote settings to game mode votes other than extended will not be announced. 2013-08-23 05:47:45 -07:00
Zuhayr
bbfe26bde8 Merge pull request #3503 from Mloc/master 
Fully reverts clickdelay change.
 2013-08-13 05:20:35 -07:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change. 
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-13 13:10:09 +01:00
Segrain
ccb87c446a Vox beards. 2013-08-13 09:21:28 +03:00
Zuhayr
bed45dd864 Removes Vox flavour text carried over from chargen. 2013-08-13 00:03:14 -07:00
Zuhayr
4874d5691b Removes multicultural mrowling Vox from Heist. 2013-08-13 00:00:34 -07:00
Zuhayr
5476ae192d Attempting to reduce incidence of clickspam against mobs. 2013-08-12 22:44:57 -07:00
Zuhayr
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Erthilo
166a7e57a6 Cult 'raise' rune how completely heals raised corpse. 2013-08-11 17:38:12 +01:00
Zuhayr
a8c892a938 Fixes Heist check_antag verb. 2013-08-11 14:03:46 -07:00
Zuhayr
9ee5d58ca6 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2013-08-10 12:24:33 -07:00
Segrain
1d533de46a Vox limbs. 2013-08-10 06:16:47 +03:00
Zuhayr
bb06b50177 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-09 13:21:54 -07:00
Segrain
907f9311ba Vox flavor text. 2013-08-09 07:09:50 +03:00
Mloc-Argent
941f36ddec Fix for autotraitor not working in secret probabilities. All modes default to 0 prob in secret now. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-07 16:56:41 +01:00
Zuhayr
98bbb095ad Swapped languages and datums over to global lists. Updated verbs. 2013-08-05 20:34:38 -07:00
comma
e45f429e4c Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	maps/tgstation.2.1.0.0.1.dmm
 2013-08-04 01:40:32 +04:00
Zuhayr
0f0ac218b3 Commented out blob and wish granter. 2013-08-03 12:51:41 -07:00
Zuhayr
27f7d1580d Merge branch 'feature' of https://github.com/Zuhayr/Baystation12 2013-08-02 20:16:50 -07:00
Zuhayr
37f134ec42 Corruption fix - we had way too many strings somehow. 2013-08-02 20:14:20 -07:00
Zuhayr
b4e8c60472 Merge resolution. 2013-07-31 19:21:58 -07:00
Zuhayr
f50256eabb Work progresses on species datums. Mass-commit due to repo issues requiring a reset. 2013-07-31 11:50:56 -07:00
Erthilo
89ffc92168 Fixes text errors in ghost manifest runes and newscasters with apostrophes. 2013-07-30 22:36:42 +01:00
Zuhayr
919dc1ae25 Added longer text to vox greeting message in Heist. 2013-07-29 06:39:43 -07:00
Zuhayr
8c3c26e2e8 Added cortical stacks for vox survival objective. 2013-07-29 06:36:55 -07:00